summaryrefslogtreecommitdiff
path: root/audio/kdemultimedia3/patches/patch-cf
diff options
context:
space:
mode:
Diffstat (limited to 'audio/kdemultimedia3/patches/patch-cf')
-rw-r--r--audio/kdemultimedia3/patches/patch-cf28
1 files changed, 18 insertions, 10 deletions
diff --git a/audio/kdemultimedia3/patches/patch-cf b/audio/kdemultimedia3/patches/patch-cf
index 1ff8be86629..177b2726c63 100644
--- a/audio/kdemultimedia3/patches/patch-cf
+++ b/audio/kdemultimedia3/patches/patch-cf
@@ -1,8 +1,8 @@
-$NetBSD: patch-cf,v 1.4 2003/05/22 03:05:41 markd Exp $
+$NetBSD: patch-cf,v 1.5 2003/07/30 14:56:04 markd Exp $
---- noatun/modules/systray/Makefile.in.orig Thu May 8 00:05:29 2003
+--- noatun/modules/systray/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200
+++ noatun/modules/systray/Makefile.in
-@@ -381,7 +381,7 @@ kde_module_LTLIBRARIES = noatun_systray.
+@@ -382,7 +382,7 @@ kde_module_LTLIBRARIES = noatun_systray.
noatun_systray_la_SOURCES = systray.cpp noatunui.cpp kitsystemtray.cpp cmodule.cpp
noatun_systray_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -11,7 +11,7 @@ $NetBSD: patch-cf,v 1.4 2003/05/22 03:05:41 markd Exp $
-lqtmcop -lkmedia2_idl -lsoundserver_idl
-@@ -400,7 +400,7 @@ CONFIG_CLEAN_FILES =
+@@ -401,7 +401,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_systray_la_DEPENDENCIES = \
@@ -20,16 +20,16 @@ $NetBSD: patch-cf,v 1.4 2003/05/22 03:05:41 markd Exp $
am_noatun_systray_la_OBJECTS = systray.lo noatunui.lo kitsystemtray.lo \
cmodule.lo
#>- noatun_systray_la_OBJECTS = $(am_noatun_systray_la_OBJECTS)
-@@ -630,7 +630,7 @@ distclean-tags:
+@@ -631,7 +631,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=cr16-action-noatuntrayplay.png cr16-action-noatuntray.png systray.plugin systrayui.rc cr16-action-noatuntraystop.png cr16-action-noatuntraypause.png
-+KDE_DIST=cr16-action-noatuntrayplay.png systray.plugin cr16-action-noatuntray.png cr16-action-noatuntraystop.png systrayui.rc cr16-action-noatuntraypause.png
++KDE_DIST=cr16-action-noatuntrayplay.png Makefile.in.rej systray.plugin cr16-action-noatuntray.png cr16-action-noatuntraystop.png systrayui.rc cr16-action-noatuntraypause.png
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -783,20 +783,20 @@ noatun_systray.la.closure: $(noatun_syst
+@@ -784,11 +784,11 @@ noatun_systray.la.closure: $(noatun_syst
#>+ 3
@@ -38,16 +38,24 @@ $NetBSD: patch-cf,v 1.4 2003/05/22 03:05:41 markd Exp $
+cmodule.moc: $(srcdir)/cmodule.h
+ $(MOC) $(srcdir)/cmodule.h -o cmodule.moc
+ #>+ 1
+-mocs: kitsystemtray.moc
++mocs: cmodule.moc
#>+ 3
systray.moc: $(srcdir)/systray.h
$(MOC) $(srcdir)/systray.h -o systray.moc
-
+@@ -796,14 +796,14 @@ systray.moc: $(srcdir)/systray.h
+ #>+ 1
+ mocs: systray.moc
#>+ 3
-cmodule.moc: $(srcdir)/cmodule.h
- $(MOC) $(srcdir)/cmodule.h -o cmodule.moc
+kitsystemtray.moc: $(srcdir)/kitsystemtray.h
+ $(MOC) $(srcdir)/kitsystemtray.h -o kitsystemtray.moc
+ #>+ 1
+-mocs: cmodule.moc
++mocs: kitsystemtray.moc
#>+ 3
clean-metasources:
- -rm -f kitsystemtray.moc systray.moc cmodule.moc
@@ -55,7 +63,7 @@ $NetBSD: patch-cf,v 1.4 2003/05/22 03:05:41 markd Exp $
#>+ 3
clean-closures:
-@@ -827,7 +827,7 @@ force-reedit:
+@@ -834,7 +834,7 @@ force-reedit:
#>+ 11
@@ -64,7 +72,7 @@ $NetBSD: patch-cf,v 1.4 2003/05/22 03:05:41 markd Exp $
@echo 'creating noatun_systray_la.all_cpp.cpp ...'; \
rm -f noatun_systray_la.all_cpp.files noatun_systray_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> noatun_systray_la.all_cpp.final; \
-@@ -863,9 +863,9 @@ kde-rpo-clean:
+@@ -870,9 +870,9 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 7