summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank van de Pol <fvdpol@gentoo.org>2004-07-07 22:55:31 +0000
committerFrank van de Pol <fvdpol@gentoo.org>2004-07-07 22:55:31 +0000
commit3c04f42f7f0705e69919681faeff2821c3c32c1f (patch)
treed7a6711f5455cd4e66865c89fce6bbb49e518074 /media-sound/musicman/files
parent-* as it's a binary package. (Manifest recommit) (diff)
downloadgentoo-2-3c04f42f7f0705e69919681faeff2821c3c32c1f.tar.gz
gentoo-2-3c04f42f7f0705e69919681faeff2821c3c32c1f.tar.bz2
gentoo-2-3c04f42f7f0705e69919681faeff2821c3c32c1f.zip
Added amd64 and gcc34 patches.
Diffstat (limited to 'media-sound/musicman/files')
-rw-r--r--media-sound/musicman/files/digest-musicman-0.11-r11
-rw-r--r--media-sound/musicman/files/musicman-0.11-amd64.patch35
-rw-r--r--media-sound/musicman/files/musicman-0.11-gcc34.patch24
3 files changed, 60 insertions, 0 deletions
diff --git a/media-sound/musicman/files/digest-musicman-0.11-r1 b/media-sound/musicman/files/digest-musicman-0.11-r1
new file mode 100644
index 000000000000..ae32d97cb99f
--- /dev/null
+++ b/media-sound/musicman/files/digest-musicman-0.11-r1
@@ -0,0 +1 @@
+MD5 d5173a90c28d770acbfaf101629d8e6c musicman-0.11.tar.gz 1445222
diff --git a/media-sound/musicman/files/musicman-0.11-amd64.patch b/media-sound/musicman/files/musicman-0.11-amd64.patch
new file mode 100644
index 000000000000..286588a377c3
--- /dev/null
+++ b/media-sound/musicman/files/musicman-0.11-amd64.patch
@@ -0,0 +1,35 @@
+diff -ur musicman-orig/musicman/Makefile.in musicman/musicman/Makefile.in
+--- musicman-orig/musicman/Makefile.in 2004-07-07 23:44:30.716251088 +0200
++++ musicman/musicman/Makefile.in 2004-07-07 23:41:52.214347040 +0200
+@@ -312,7 +312,7 @@
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) -fPIC $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+diff -ur musicman-orig/musicman/kcmmusicman/Makefile.in musicman/musicman/kcmmusicman/Makefile.in
+--- musicman-orig/musicman/kcmmusicman/Makefile.in 2004-07-07 23:44:31.811084648 +0200
++++ musicman/musicman/kcmmusicman/Makefile.in 2004-07-07 23:39:34.050351160 +0200
+@@ -285,7 +285,7 @@
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) -fPIC $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+--- musicman-orig/admin/acinclude.m4.in 2004-07-08 00:20:08.385276000 +0200
++++ musicman/admin/acinclude.m4.in 2004-07-08 00:41:30.770323840 +0200
+@@ -2774,7 +2774,7 @@
+ LDFLAGS=""
+ fi
+
+- CXXFLAGS=" $CXXFLAGS"
++ CXXFLAGS=" $CXXFLAGS -fPIC"
+
+ AC_PROG_CXX
+
diff --git a/media-sound/musicman/files/musicman-0.11-gcc34.patch b/media-sound/musicman/files/musicman-0.11-gcc34.patch
new file mode 100644
index 000000000000..65e3f9431f33
--- /dev/null
+++ b/media-sound/musicman/files/musicman-0.11-gcc34.patch
@@ -0,0 +1,24 @@
+diff -ur musicman-orig/musicman/kcmmusicman/mmconfig.cpp musicman/musicman/kcmmusicman/mmconfig.cpp
+--- musicman-orig/musicman/kcmmusicman/mmconfig.cpp 2004-07-07 23:28:20.057813600 +0200
++++ musicman/musicman/kcmmusicman/mmconfig.cpp 2004-07-07 23:29:14.285569728 +0200
+@@ -34,7 +34,7 @@
+
+
+ typedef KGenericFactory<MMConfig, QWidget> KDEDFactory;
+-K_EXPORT_COMPONENT_FACTORY( kcm_musicman, KDEDFactory( "kcmmusicman" ) );
++K_EXPORT_COMPONENT_FACTORY( kcm_musicman, KDEDFactory( "kcmmusicman" ) )
+
+
+
+diff -ur musicman-orig/musicman/musicman.cpp musicman/musicman/musicman.cpp
+--- musicman-orig/musicman/musicman.cpp 2004-07-07 23:28:20.052814360 +0200
++++ musicman/musicman/musicman.cpp 2004-07-07 23:43:00.788922120 +0200
+@@ -40,7 +40,7 @@
+
+
+ typedef KGenericFactory<MusicMan, KonqPopupMenu> MusicManFactory;
+-K_EXPORT_COMPONENT_FACTORY( libmusicman, MusicManFactory("musicman") );
++K_EXPORT_COMPONENT_FACTORY( libmusicman, MusicManFactory("musicman") )
+
+
+ MusicMan::MusicMan(KonqPopupMenu *popupmenu,const char *name,const QStringList &list) :