]> git.pld-linux.org Git - packages/scribus.git/blobdiff - scribus-module-fixes.patch
- fix problems with autoconf 2.60 which creates configure that runs in POSIX mode
[packages/scribus.git] / scribus-module-fixes.patch
index 3460962e5a412ec461a916b708e9a55d721d7182..c26366e7a703f26fbc29059dce9712c8bb9b29d2 100644 (file)
-diff -Nur scribus-0.9.7/scribus/libabout/Makefile.am scribus-0.9.7-patch/scribus/libabout/Makefile.am
---- scribus-0.9.7/scribus/libabout/Makefile.am Sat Feb  8 09:42:42 2003
-+++ scribus-0.9.7-patch/scribus/libabout/Makefile.am   Fri Mar 14 14:34:19 2003
+diff -Nur scribus-1.3.2/scribus/plugins/colorwheel/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/colorwheel/Makefile.am
+--- scribus-1.3.2/scribus/plugins/colorwheel/Makefile.am       2005-12-28 16:09:58.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/colorwheel/Makefile.am   2006-01-18 16:50:27.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 -Nur scribus-1.3.2/scribus/plugins/fileloader/oldscribusformat/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/fileloader/oldscribusformat/Makefile.am
+--- scribus-1.3.2/scribus/plugins/fileloader/oldscribusformat/Makefile.am      2005-12-28 16:09:59.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/fileloader/oldscribusformat/Makefile.am  2006-01-18 16:50:46.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 -Nur scribus-1.3.2/scribus/plugins/fileloader/oodraw/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/fileloader/oodraw/Makefile.am
+--- scribus-1.3.2/scribus/plugins/fileloader/oodraw/Makefile.am        2005-12-28 16:09:59.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/fileloader/oodraw/Makefile.am    2006-01-18 16:50:54.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 -Nur scribus-1.3.2/scribus/plugins/fontpreview/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/fontpreview/Makefile.am
+--- scribus-1.3.2/scribus/plugins/fontpreview/Makefile.am      2005-12-28 16:09:59.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/fontpreview/Makefile.am  2006-01-18 16:51:03.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 = ui.cpp fontpreview.cpp
+diff -Nur scribus-1.3.2/scribus/plugins/gettext/csvim/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/gettext/csvim/Makefile.am
+--- scribus-1.3.2/scribus/plugins/gettext/csvim/Makefile.am    2005-12-28 16:09:59.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/gettext/csvim/Makefile.am        2006-01-18 16:51:17.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 -Nur scribus-1.3.2/scribus/plugins/gettext/htmlim/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/gettext/htmlim/Makefile.am
+--- scribus-1.3.2/scribus/plugins/gettext/htmlim/Makefile.am   2005-12-28 16:09:59.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/gettext/htmlim/Makefile.am       2006-01-18 16:51:25.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 -Nur scribus-1.3.2/scribus/plugins/gettext/odtim/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/gettext/odtim/Makefile.am
+--- scribus-1.3.2/scribus/plugins/gettext/odtim/Makefile.am    2005-12-28 16:09:59.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/gettext/odtim/Makefile.am        2006-01-18 16:51:31.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 -Nur scribus-1.3.2/scribus/plugins/gettext/sxwim/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/gettext/sxwim/Makefile.am
+--- scribus-1.3.2/scribus/plugins/gettext/sxwim/Makefile.am    2005-12-28 16:09:59.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/gettext/sxwim/Makefile.am        2006-01-18 16:51:36.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 -Nur scribus-1.3.2/scribus/plugins/gettext/textfilter/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/gettext/textfilter/Makefile.am
+--- scribus-1.3.2/scribus/plugins/gettext/textfilter/Makefile.am       2005-12-28 16:10:00.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/gettext/textfilter/Makefile.am   2006-01-18 16:51:42.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 -Nur scribus-1.3.2/scribus/plugins/gettext/txtim/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/gettext/txtim/Makefile.am
+--- scribus-1.3.2/scribus/plugins/gettext/txtim/Makefile.am    2005-12-28 16:10:02.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/gettext/txtim/Makefile.am        2006-01-18 16:51:48.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 -Nur scribus-1.3.2/scribus/plugins/myplugin/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/myplugin/Makefile.am
+--- scribus-1.3.2/scribus/plugins/myplugin/Makefile.am 2005-12-28 16:10:02.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/myplugin/Makefile.am     2006-01-18 16:51:55.000000000 +0100
 @@ -9,7 +9,7 @@
- LDFLAGS =  -s                    -export-dynamic 
  
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
  
--libabout_la_LDFLAGS = -version-info 0:0:0
-+libabout_la_LDFLAGS = -avoid-version
+-libmyplugin_la_LDFLAGS = -version-info 0:0:0
++libmyplugin_la_LDFLAGS = -avoid-version
+ libmyplugin_la_METASOURCES = AUTO
+ libmyplugin_la_SOURCES = myplugin.cpp mypluginimpl.cpp
  
- libabout_la_METASOURCES = AUTO
+diff -Nur scribus-1.3.2/scribus/plugins/newfromtemplateplugin/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/newfromtemplateplugin/Makefile.am
+--- scribus-1.3.2/scribus/plugins/newfromtemplateplugin/Makefile.am    2005-12-28 16:10:02.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/newfromtemplateplugin/Makefile.am        2006-01-18 16:52:04.000000000 +0100
+@@ -6,7 +6,7 @@
  
-diff -Nur scribus-0.9.7/scribus/libpdf/Makefile.am scribus-0.9.7-patch/scribus/libpdf/Makefile.am
---- scribus-0.9.7/scribus/libpdf/Makefile.am   Sat Feb  8 09:42:42 2003
-+++ scribus-0.9.7-patch/scribus/libpdf/Makefile.am     Fri Mar 14 14:34:06 2003
-@@ -10,7 +10,7 @@
- LDFLAGS =  -s                    -export-dynamic 
+ 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
  
--libpdf_la_LDFLAGS = -version-info 0:0:0
-+libpdf_la_LDFLAGS = -avoid-version
+diff -Nur scribus-1.3.2/scribus/plugins/pixmapexport/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/pixmapexport/Makefile.am
+--- scribus-1.3.2/scribus/plugins/pixmapexport/Makefile.am     2005-12-28 16:10:02.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/pixmapexport/Makefile.am 2006-01-18 16:52:10.000000000 +0100
+@@ -6,7 +6,7 @@
  
- libpdf_la_METASOURCES = AUTO
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
  
-diff -Nur scribus-0.9.7/scribus/libpostscript/Makefile.am scribus-0.9.7-patch/scribus/libpostscript/Makefile.am
---- scribus-0.9.7/scribus/libpostscript/Makefile.am    Sat Feb  8 09:42:42 2003
-+++ scribus-0.9.7-patch/scribus/libpostscript/Makefile.am      Fri Mar 14 14:33:50 2003
-@@ -10,7 +10,7 @@
- LDFLAGS =  -s                    -export-dynamic 
+-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 -Nur scribus-1.3.2/scribus/plugins/psimport/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/psimport/Makefile.am
+--- scribus-1.3.2/scribus/plugins/psimport/Makefile.am 2005-12-28 16:10:02.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/psimport/Makefile.am     2006-01-18 16:52:15.000000000 +0100
+@@ -6,7 +6,7 @@
  
--libpostscript_la_LDFLAGS = -version-info 0:0:0
-+libpostscript_la_LDFLAGS = -avoid-version
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
  
- libpostscript_la_METASOURCES = AUTO
+-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 -Nur scribus-0.9.7/scribus/libprefs/Makefile.am scribus-0.9.7-patch/scribus/libprefs/Makefile.am
---- scribus-0.9.7/scribus/libprefs/Makefile.am Sat Feb  8 09:42:42 2003
-+++ scribus-0.9.7-patch/scribus/libprefs/Makefile.am   Fri Mar 14 14:34:32 2003
-@@ -10,7 +10,7 @@
- LDFLAGS =  -s                    -export-dynamic 
+diff -Nur scribus-1.3.2/scribus/plugins/saveastemplateplugin/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/saveastemplateplugin/Makefile.am
+--- scribus-1.3.2/scribus/plugins/saveastemplateplugin/Makefile.am     2005-12-28 16:10:03.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/saveastemplateplugin/Makefile.am 2006-01-18 16:52:40.000000000 +0100
+@@ -6,7 +6,7 @@
  
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
  
--libpreferences_la_LDFLAGS = -version-info 0:0:0
-+libpreferences_la_LDFLAGS = -avoid-version
+-libsaveastemplateplugin_la_LDFLAGS = -version-info 0:0:0
++libsaveastemplateplugin_la_LDFLAGS = -avoid-version
+ libsaveastemplateplugin_la_METASOURCES = AUTO
+ libsaveastemplateplugin_la_SOURCES = satemplate.cpp satdialog.cpp 
  
- libpreferences_la_METASOURCES = AUTO
+diff -Nur scribus-1.3.2/scribus/plugins/scriptplugin/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/scriptplugin/Makefile.am
+--- scribus-1.3.2/scribus/plugins/scriptplugin/Makefile.am     2006-01-07 23:25:38.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/scriptplugin/Makefile.am 2006-01-18 16:52:55.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
  
---- scribus-1.1.2/scribus/plugins/libchar/Makefile.am.orig     Thu Jun 19 12:53:49 2003
-+++ scribus-1.1.2/scribus/plugins/libchar/Makefile.am  Tue Nov  4 11:47:35 2003
+ libscriptplugin_la_SOURCES = \
+diff -Nur scribus-1.3.2/scribus/plugins/short-words/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/short-words/Makefile.am
+--- scribus-1.3.2/scribus/plugins/short-words/Makefile.am      2005-12-28 16:10:03.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/short-words/Makefile.am  2006-01-18 16:53:16.000000000 +0100
 @@ -4,7 +4,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
  
--libcharselect_la_LDFLAGS = -version-info 0:0:0
-+libcharselect_la_LDFLAGS = -avoid-version
+-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
  
- libcharselect_la_METASOURCES = AUTO
---- scribus-1.1.2/scribus/plugins/svgexplugin/Makefile.am.orig Thu Jun 19 12:53:49 2003
-+++ scribus-1.1.2/scribus/plugins/svgexplugin/Makefile.am      Tue Nov  4 12:05:50 2003
-@@ -3,7 +3,7 @@
+diff -Nur scribus-1.3.2/scribus/plugins/svgexplugin/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/svgexplugin/Makefile.am
+--- scribus-1.3.2/scribus/plugins/svgexplugin/Makefile.am      2005-12-28 16:10:04.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/svgexplugin/Makefile.am  2006-01-18 16:53:21.000000000 +0100
+@@ -2,7 +2,7 @@
  plugins_LTLIBRARIES = libsvgexplugin.la
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
- AM_LDFLAGS =  -s $(LIBFREETYPE_LIBS)      
+ 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
---- scribus-1.1.2/scribus/plugins/svgimplugin/Makefile.am.orig Fri Aug 15 13:14:10 2003
-+++ scribus-1.1.2/scribus/plugins/svgimplugin/Makefile.am      Tue Nov  4 12:06:09 2003
-@@ -3,7 +3,7 @@
+diff -Nur scribus-1.3.2/scribus/plugins/svgimplugin/Makefile.am scribus-1.3.2-modulefixes/scribus/plugins/svgimplugin/Makefile.am
+--- scribus-1.3.2/scribus/plugins/svgimplugin/Makefile.am      2005-12-28 16:10:04.000000000 +0100
++++ scribus-1.3.2-modulefixes/scribus/plugins/svgimplugin/Makefile.am  2006-01-18 16:53:29.000000000 +0100
+@@ -2,7 +2,7 @@
  plugins_LTLIBRARIES = libsvgimplugin.la
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
- AM_LDFLAGS =  -s $(LIBFREETYPE_LIBS)      
+ 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
---- scribus-1.1.2/scribus/plugins/printpreview/Makefile.am.orig        Thu Jun 19 12:53:49 2003
-+++ scribus-1.1.2/scribus/plugins/printpreview/Makefile.am     Tue Nov  4 12:05:02 2003
-@@ -4,7 +4,7 @@
- INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
--libpreview_la_LDFLAGS = -version-info 0:0:0
-+libpreview_la_LDFLAGS = -avoid-version
- libpreview_la_METASOURCES = AUTO
---- scribus-1.1.2/scribus/plugins/scriptplugin/Makefile.am.orig        Mon Oct 20 21:40:21 2003
-+++ scribus-1.1.2/scribus/plugins/scriptplugin/Makefile.am     Tue Nov  4 12:05:24 2003
-@@ -3,7 +3,7 @@
- AM_CPPFLAGS = -I$(top_builddir)/scribus $(PYTHONINC)
- plugins_LTLIBRARIES = libscriptplugin.la
- INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
--libscriptplugin_la_LDFLAGS = -version-info 0:0:0
-+libscriptplugin_la_LDFLAGS = -avoid-version
- libscriptplugin_la_METASOURCES = AUTO
- libscriptplugin_la_SOURCES = cmdutil.cpp cmddialog.cpp cmddoc.cpp cmdpage.cpp cmdobj.cpp cmdgetprop.cpp cmdsetprop.cpp cmdtext.cpp cmdmani.cpp cmdcolor.cpp cmdmisc.cpp conswin.cpp pconsole.cpp scriptplugin.cpp 
- EXTRA_DIST = cmdvar.h cmdutil.cpp cmdutil.h cmddialog.cpp cmddialog.h cmddoc.cpp cmddoc.h cmdpage.cpp cmdpage.h cmdobj.cpp cmdobj.h cmdgetprop.cpp cmdgetprop.h cmdsetprop.cpp cmdsetprop.h cmdtext.cpp cmdtext.h cmdmani.cpp cmdmani.h cmdcolor.cpp cmdcolor.h cmdmisc.cpp cmdmisc.h scriptplugin.cpp scriptplugin.h pconsole.cpp pconsole.h conswin.cpp conswin.h 
This page took 0.06748 seconds and 4 git commands to generate.