From: Arkadiusz Miśkiewicz Date: Sun, 5 Jul 2009 17:29:04 +0000 (+0000) Subject: - drop obsolete files X-Git-Tag: auto/th/scribus-1_3_3_13-3~1 X-Git-Url: https://git.pld-linux.org/?p=packages%2Fscribus.git;a=commitdiff_plain;h=88fa5ce76e14b1c51502f44efabb6325898e3f09 - drop obsolete files Changed files: kde-ac260-lt.patch -> 1.2 kde-common-LD_quote.patch -> 1.4 scribus-module-fixes.patch -> 1.8 scribus-nolibs.patch -> 1.6 scribus-python.patch -> 1.10 --- diff --git a/kde-ac260-lt.patch b/kde-ac260-lt.patch deleted file mode 100644 index acbbc6c..0000000 --- a/kde-ac260-lt.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN arts-1.5.4.org/admin/libtool.m4.in arts-1.5.4/admin/libtool.m4.in ---- arts-1.5.4.org/admin/libtool.m4.in 2006-07-24 09:06:24.000000000 +0200 -+++ arts-1.5.4/admin/libtool.m4.in 2006-09-09 12:45:13.172062500 +0200 -@@ -3542,7 +3542,7 @@ - # The `*' in the case matches for architectures that use `case' in - # $output_verbose_cmd can trigger glob expansion during the loop - # eval without this substitution. -- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" -+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` - - for p in `eval $output_verbose_link_cmd`; do - case $p in diff --git a/kde-common-LD_quote.patch b/kde-common-LD_quote.patch deleted file mode 100644 index 7d65c3f..0000000 --- a/kde-common-LD_quote.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- gwenview-1.4.0/admin/am_edit 2006-09-25 00:04:55.213036950 +0300 -+++ kdelibs-3.5.5/admin/am_edit 2006-10-03 11:40:08.052152886 +0300 -@@ -499,6 +499,15 @@ - } - } - -+ $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CXXLD\)'; -+ if ($MakefileData =~ m/$lookup/) { -+ substituteLine($lookup, "$1 \"\$\(CXXLD\)\""); -+ } -+ $lookup = '(LINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CCLD\)'; -+ if ($MakefileData =~ m/$lookup/) { -+ substituteLine($lookup, "$1 \"\$\(CCLD\)\""); -+ } -+ - $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g; - - $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)'; -@@ -578,6 +587,14 @@ - local @kde_options = split(/[\034\s]+/, $kde_options_str); - if (grep(/^foreign$/, @kde_options)) { - push(@foreignfiles, $makefileDir . "/"); -+ -+ # always do this. don't care if it's foreign file. we *need* CXXLD quoted for libtool argument. -+ $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link) \$\(CXXLD\)'; -+ if ($MakefileData =~ m/$lookup/) { -+ substituteLine($lookup, "$1 \"\$\(CXXLD\)\""); -+ updateMakefile (); -+ } -+ - return 0; # don't touch me - } - for $opt (@kde_options) { diff --git a/scribus-module-fixes.patch b/scribus-module-fixes.patch deleted file mode 100644 index 51e52cc..0000000 --- a/scribus-module-fixes.patch +++ /dev/null @@ -1,264 +0,0 @@ -diff -ur scribus-1.3.3.4/scribus/plugins/barcodegenerator/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/barcodegenerator/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/barcodegenerator/Makefile.am 2006-03-14 01:11:47.000000000 +0100 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/barcodegenerator/Makefile.am 2006-10-29 15:41:24.000000000 +0100 -@@ -4,7 +4,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - --libbarcodegenerator_la_LDFLAGS = -version-info 0:0:0 -+libbarcodegenerator_la_LDFLAGS = -avoid-version - libbarcodegenerator_la_METASOURCES = AUTO - libbarcodegenerator_la_SOURCES = barcode.cpp barcodegeneratorbase.ui barcodegenerator.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/colorwheel/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/colorwheel/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/colorwheel/Makefile.am 2006-03-29 14:41:03.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/colorwheel/Makefile.am 2006-10-29 15:40:05.000000000 +0100 -@@ -4,7 +4,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - --libcolorwheel_la_LDFLAGS = -version-info 0:0:0 -+libcolorwheel_la_LDFLAGS = -avoid-version - libcolorwheel_la_METASOURCES = AUTO - libcolorwheel_la_SOURCES = colorwheel.cpp colorwheelwidget.cpp cwdialog.cpp colorblind.cpp cwsetcolor.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/fileloader/oldscribusformat/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/fileloader/oldscribusformat/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/fileloader/oldscribusformat/Makefile.am 2005-12-28 16:09:59.000000000 +0100 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/fileloader/oldscribusformat/Makefile.am 2006-10-29 15:40:05.000000000 +0100 -@@ -4,7 +4,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - --liboldscribusformat_la_LDFLAGS = -version-info 0:0:0 -+liboldscribusformat_la_LDFLAGS = -avoid-version - liboldscribusformat_la_METASOURCES = AUTO - liboldscribusformat_la_SOURCES = oldscribusformat.cpp oldscribusformatimpl.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/fileloader/oodraw/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/fileloader/oodraw/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/fileloader/oodraw/Makefile.am 2006-03-29 14:41:03.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/fileloader/oodraw/Makefile.am 2006-10-29 15:40:06.000000000 +0100 -@@ -6,7 +6,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - --liboodrawimp_la_LDFLAGS = -version-info 0:0:0 -+liboodrawimp_la_LDFLAGS = -avoid-version - liboodrawimp_la_METASOURCES = AUTO - liboodrawimp_la_SOURCES = oodrawimp.cpp stylestack.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/fontpreview/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/fontpreview/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/fontpreview/Makefile.am 2006-08-05 14:20:33.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/fontpreview/Makefile.am 2006-10-29 15:40:06.000000000 +0100 -@@ -4,7 +4,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - --libfontpreview_la_LDFLAGS = -version-info 0:0:0 -+libfontpreview_la_LDFLAGS = -avoid-version - libfontpreview_la_METASOURCES = AUTO - libfontpreview_la_SOURCES = fontpreviewplugin.cpp fontpreview.cpp fontpreviewbase.ui - -diff -ur scribus-1.3.3.4/scribus/plugins/gettext/csvim/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/csvim/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/gettext/csvim/Makefile.am 2006-03-29 14:41:03.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/csvim/Makefile.am 2006-10-29 15:40:06.000000000 +0100 -@@ -6,7 +6,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - --libcsvim_la_LDFLAGS = -version-info 0:0:0 -+libcsvim_la_LDFLAGS = -avoid-version - libcsvim_la_METASOURCES = AUTO - libcsvim_la_SOURCES = csvdia.cpp csvim.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/gettext/docim/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/docim/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/gettext/docim/Makefile.am 2006-03-29 14:41:03.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/docim/Makefile.am 2006-10-29 15:42:44.000000000 +0100 -@@ -6,7 +6,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - --libdocim_la_LDFLAGS = -version-info 0:0:0 -+libdocim_la_LDFLAGS = -avoid-version - libdocim_la_METASOURCES = AUTO - libdocim_la_SOURCES = docim.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/gettext/htmlim/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/htmlim/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/gettext/htmlim/Makefile.am 2006-03-29 14:41:03.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/htmlim/Makefile.am 2006-10-29 15:40:06.000000000 +0100 -@@ -6,7 +6,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(XML_CFLAGS) $(all_includes) - --libhtmlim_la_LDFLAGS = -version-info 0:0:0 -+libhtmlim_la_LDFLAGS = -avoid-version - libhtmlim_la_METASOURCES = AUTO - libhtmlim_la_SOURCES = htmlim.cpp htmlreader.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/gettext/odtim/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/odtim/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/gettext/odtim/Makefile.am 2006-03-29 14:41:03.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/odtim/Makefile.am 2006-10-29 15:40:06.000000000 +0100 -@@ -6,7 +6,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(XML_CFLAGS) $(all_includes) - --libodtimplugin_la_LDFLAGS = -version-info 0:0:0 -+libodtimplugin_la_LDFLAGS = -avoid-version - libodtimplugin_la_METASOURCES = AUTO - libodtimplugin_la_SOURCES = odtim.cpp odtdia.cpp stylereader.cpp contentreader.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/gettext/pdbim/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/pdbim/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/gettext/pdbim/Makefile.am 2006-03-29 14:41:05.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/pdbim/Makefile.am 2006-10-29 15:43:04.000000000 +0100 -@@ -6,7 +6,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - --libpdbim_la_LDFLAGS = -version-info 0:0:0 -+libpdbim_la_LDFLAGS = -avoid-version - libpdbim_la_METASOURCES = AUTO - libpdbim_la_SOURCES = pdbim.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/gettext/sxwim/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/sxwim/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/gettext/sxwim/Makefile.am 2006-03-29 14:41:08.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/sxwim/Makefile.am 2006-10-29 15:40:06.000000000 +0100 -@@ -6,7 +6,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(XML_CFLAGS) $(all_includes) - --libsxwimplugin_la_LDFLAGS = -version-info 0:0:0 -+libsxwimplugin_la_LDFLAGS = -avoid-version - libsxwimplugin_la_METASOURCES = AUTO - libsxwimplugin_la_SOURCES = sxwim.cpp sxwdia.cpp stylereader.cpp contentreader.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/gettext/textfilter/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/textfilter/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/gettext/textfilter/Makefile.am 2006-03-29 14:41:10.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/textfilter/Makefile.am 2006-10-29 15:40:06.000000000 +0100 -@@ -6,7 +6,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - --libtextfilterplugin_la_LDFLAGS = -version-info 0:0:0 -+libtextfilterplugin_la_LDFLAGS = -avoid-version - libtextfilterplugin_la_METASOURCES = AUTO - libtextfilterplugin_la_SOURCES = textfilter.cpp tfdia.cpp tffilter.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/gettext/txtim/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/txtim/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/gettext/txtim/Makefile.am 2006-03-29 14:41:10.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/txtim/Makefile.am 2006-10-29 15:40:06.000000000 +0100 -@@ -6,7 +6,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - --libtxtim_la_LDFLAGS = -version-info 0:0:0 -+libtxtim_la_LDFLAGS = -avoid-version - libtxtim_la_METASOURCES = AUTO - libtxtim_la_SOURCES = txtim.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/myplugin/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/myplugin/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/myplugin/Makefile.am 2005-12-28 16:10:02.000000000 +0100 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/myplugin/Makefile.am 2006-10-29 15:40:06.000000000 +0100 -@@ -9,7 +9,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - --libmyplugin_la_LDFLAGS = -version-info 0:0:0 -+libmyplugin_la_LDFLAGS = -avoid-version - libmyplugin_la_METASOURCES = AUTO - libmyplugin_la_SOURCES = myplugin.cpp mypluginimpl.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/newfromtemplateplugin/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/newfromtemplateplugin/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/newfromtemplateplugin/Makefile.am 2006-03-29 14:41:11.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/newfromtemplateplugin/Makefile.am 2006-10-29 15:40:06.000000000 +0100 -@@ -6,7 +6,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - --libnewfromtemplateplugin_la_LDFLAGS = -version-info 0:0:0 -+libnewfromtemplateplugin_la_LDFLAGS = -avoid-version - libnewfromtemplateplugin_la_METASOURCES = AUTO - libnewfromtemplateplugin_la_SOURCES = nftemplate.cpp nftdialog.cpp nftrcreader.cpp nftsettings.cpp nfttemplate.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/pixmapexport/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/pixmapexport/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/pixmapexport/Makefile.am 2006-03-29 14:41:11.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/pixmapexport/Makefile.am 2006-10-29 15:40:06.000000000 +0100 -@@ -6,7 +6,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - --libscribusexportpixmap_la_LDFLAGS = -version-info 0:0:0 -+libscribusexportpixmap_la_LDFLAGS = -avoid-version - libscribusexportpixmap_la_METASOURCES = AUTO - libscribusexportpixmap_la_SOURCES = export.cpp dialog.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/psimport/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/psimport/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/psimport/Makefile.am 2006-03-29 14:41:11.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/psimport/Makefile.am 2006-10-29 15:40:06.000000000 +0100 -@@ -6,7 +6,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - --libimportps_la_LDFLAGS = -version-info 0:0:0 -+libimportps_la_LDFLAGS = -avoid-version - libimportps_la_METASOURCES = AUTO - libimportps_la_SOURCES = importps.cpp importpsplugin.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/saveastemplateplugin/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/saveastemplateplugin/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/saveastemplateplugin/Makefile.am 2006-03-29 14:41:11.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/saveastemplateplugin/Makefile.am 2006-10-29 15:40:06.000000000 +0100 -@@ -6,7 +6,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - --libsaveastemplateplugin_la_LDFLAGS = -version-info 0:0:0 -+libsaveastemplateplugin_la_LDFLAGS = -avoid-version - libsaveastemplateplugin_la_METASOURCES = AUTO - libsaveastemplateplugin_la_SOURCES = satemplate.cpp satdialog.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/scriptplugin/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/scriptplugin/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/scriptplugin/Makefile.am 2006-03-29 14:41:11.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/scriptplugin/Makefile.am 2006-10-29 15:40:06.000000000 +0100 -@@ -6,7 +6,7 @@ - pluginsdir = $(libdir)/scribus/plugins - plugins_LTLIBRARIES = libscriptplugin.la - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) --libscriptplugin_la_LDFLAGS = -version-info 0:0:0 $(scripter2lib) -+libscriptplugin_la_LDFLAGS = -avoid-version $(scripter2lib) - libscriptplugin_la_METASOURCES = AUTO - - libscriptplugin_la_SOURCES = \ -diff -ur scribus-1.3.3.4/scribus/plugins/short-words/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/short-words/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/short-words/Makefile.am 2006-03-29 14:41:12.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/short-words/Makefile.am 2006-10-29 15:40:06.000000000 +0100 -@@ -4,7 +4,7 @@ - - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - --libscribusshortwords_la_LDFLAGS = -version-info 0:0:0 -+libscribusshortwords_la_LDFLAGS = -avoid-version - libscribusshortwords_la_METASOURCES = AUTO - libscribusshortwords_la_SOURCES = vlnadialog.cpp parse.cpp shortwords.cpp configuration.cpp version.h swprefsgui.cpp - -diff -ur scribus-1.3.3.4/scribus/plugins/svgexplugin/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/svgexplugin/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/svgexplugin/Makefile.am 2006-03-29 14:41:18.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/svgexplugin/Makefile.am 2006-10-29 15:40:06.000000000 +0100 -@@ -2,7 +2,7 @@ - plugins_LTLIBRARIES = libsvgexplugin.la - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - AM_LDFLAGS = $(LIBFREETYPE_LIBS) $(MODULE_LINK_FLAGS) --libsvgexplugin_la_LDFLAGS = -version-info 0:0:0 -+libsvgexplugin_la_LDFLAGS = -avoid-version - libsvgexplugin_la_METASOURCES = AUTO - libsvgexplugin_la_SOURCES = svgexplugin.cpp - KDE_OPTIONS = qtonly -diff -ur scribus-1.3.3.4/scribus/plugins/svgimplugin/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/svgimplugin/Makefile.am ---- scribus-1.3.3.4/scribus/plugins/svgimplugin/Makefile.am 2006-03-29 14:41:18.000000000 +0200 -+++ scribus-1.3.3.4-module-fixes/scribus/plugins/svgimplugin/Makefile.am 2006-10-29 15:40:06.000000000 +0100 -@@ -2,7 +2,7 @@ - plugins_LTLIBRARIES = libsvgimplugin.la - INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes) - AM_LDFLAGS = $(LIBFREETYPE_LIBS) $(MODULE_LINK_FLAGS) --libsvgimplugin_la_LDFLAGS = -version-info 0:0:0 -+libsvgimplugin_la_LDFLAGS = -avoid-version - libsvgimplugin_la_METASOURCES = AUTO - libsvgimplugin_la_SOURCES = svgplugin.cpp - KDE_OPTIONS = qtonly diff --git a/scribus-nolibs.patch b/scribus-nolibs.patch deleted file mode 100644 index 600e13a..0000000 --- a/scribus-nolibs.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- scribus-1.3.1/configure.in.orig 2005-10-03 02:04:41.000000000 +0200 -+++ scribus-1.3.1/configure.in 2005-10-05 13:03:41.000000000 +0200 -@@ -339,18 +339,18 @@ - fi - - dnl check for -lsocket --AC_CHECK_LIB(socket,socket, -+AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket, - if test "$uname" != "IRIX"; then - LIBS="-lsocket $LIBS" - else - echo "Not using -lsocket since you are running IRIX." --fi) --AC_CHECK_LIB(nsl,gethostbyaddr, -+fi)]) -+AC_CHECK_FUNC(gethostbyaddr,,[AC_CHECK_LIB(nsl,gethostbyaddr, - if test "$uname" != "IRIX"; then - LIBS="-lnsl $LIBS" - else - echo "Not using -lnsl since you are running IRIX." --fi) -+fi)]) - - dnl Check for lcms - dnl TODO look for lcms using pkg-config too diff --git a/scribus-python.patch b/scribus-python.patch deleted file mode 100644 index e52efca..0000000 --- a/scribus-python.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- scribus-1.2.1/admin/acinclude.m4.in 2004-11-17 10:49:56.000000000 +0100 -+++ scribus-1.2.1-patch/admin/acinclude.m4.in 2004-11-18 13:30:11.421704096 +0100 -@@ -4114,7 +4114,7 @@ - - PYTHONINC=-I$python_incdir - --python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" -+python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/share /usr/local /usr/lib64 /usr/lib$kdelibsuff $kde_extra_libs" - AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) - if test ! -r $python_libdir/libpython$version.so; then - AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) -@@ -4133,9 +4133,9 @@ - LIBPYTHON=-lpython$version - fi - --AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir) -+AC_FIND_FILE(python$version/copy.pyo, $python_libdirs, python_moddir) - python_moddir=$python_moddir/python$version --if test ! -r $python_moddir/copy.py; then -+if test ! -r $python_moddir/copy.pyo; then - python_moddir=no - fi -