diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-10-12 18:24:41 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-10-12 18:24:41 +0900 |
| commit | b72b2f09d3239813de7f3e4cf44310ca25561e64 (patch) | |
| tree | 02502370332e8fbb612ef4d1290998499a7e6ca1 /redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch | |
| parent | 9d54bb35b5fb67dd052757e3a22cb83acbba9c50 (diff) | |
| parent | 9806eb7f9c92362ca0d03e7410d1ecee9b61a38f (diff) | |
| download | tde-packaging-b72b2f09d3239813de7f3e4cf44310ca25561e64.tar.gz tde-packaging-b72b2f09d3239813de7f3e4cf44310ca25561e64.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch')
| -rw-r--r-- | redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch b/redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch deleted file mode 100644 index 719313722..000000000 --- a/redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- trinity-tdemultimedia-3.5.13.2~pre17+a4c1404c/arts/modules/common/Makefile.am.ORI 2013-05-09 10:51:39.994294437 +0200 -+++ trinity-tdemultimedia-3.5.13.2~pre17+a4c1404c/arts/modules/common/Makefile.am 2013-05-09 10:52:23.837409361 +0200 -@@ -25,7 +25,7 @@ - $(top_builddir)/arts/gui/common/libartsgui_idl.la \ - $(top_builddir)/arts/midi/libartsmidi_idl.la \ - $(top_builddir)/arts/modules/synth/libartsmodulessynth.la \ -- -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) $(LIB_QT) $(VORBISFILE_LIBS) -lgthread-2.0 -+ -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) $(LIB_QT) -lgthread-2.0 $(ARTS_LIBS) - - libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined - ---- trinity-tdemultimedia-14.0.0~pre178+601a5c5f/arts/modules/synth/Makefile.am.ORI 2013-08-04 19:15:24.030530158 +0200 -+++ trinity-tdemultimedia-14.0.0~pre178+601a5c5f/arts/modules/synth/Makefile.am 2013-08-04 19:15:32.878625492 +0200 -@@ -31,7 +31,7 @@ - libartsmodulessynth_la_LIBADD = \ - $(top_builddir)/arts/runtime/libartsbuilder.la \ - $(top_builddir)/arts/midi/libartsmidi_idl.la \ -- -lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0 -+ -lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0 $(ARTS_LIBS) - - #libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_KDEUI) $(LIB_KDECORE) - libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined ---- trinity-tdemultimedia-14.0.0~pre183+1859432c/configure.in.in.ORI 2013-09-08 17:50:11.453897325 +0200 -+++ trinity-tdemultimedia-14.0.0~pre183+1859432c/configure.in.in 2013-09-08 17:54:24.503460785 +0200 -@@ -544,15 +544,18 @@ - LIB_ARTS="-lartskde" - ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`] - ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts" -+ ARTS_LIBS=[`$PKG_CONFIG --libs-only-l arts`] - AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk]) - else - build_arts="no" - LIB_ARTS="" - ARTS_CFLAGS="" -+ ARTS_LIBS="" - AC_DEFINE(HAVE_ARTS, 0, [no arts support in juk]) - fi - - AC_SUBST(LIB_ARTS) - AC_SUBST(ARTS_CFLAGS) -+AC_SUBST(ARTS_LIBS) - - KDE_CHECK_MPEGLIB_ARTS |