[pkg-kde-commits] rev 2894 -
kde-extras/kipi-plugins/trunk/debian/patches
Tom Albers
tomalbers-guest at costa.debian.org
Sun Jan 15 21:14:43 UTC 2006
Author: tomalbers-guest
Date: 2006-01-15 21:14:42 +0000 (Sun, 15 Jan 2006)
New Revision: 2894
Added:
kde-extras/kipi-plugins/trunk/debian/patches/14_Makefile.am_use_only_used_libs.diff
kde-extras/kipi-plugins/trunk/debian/patches/space.png.tar.gz.uu
Removed:
kde-extras/kipi-plugins/trunk/debian/patches/10_kdesvn492067_fix_crash_for_canceling_dialog_imagesgallery.diff
kde-extras/kipi-plugins/trunk/debian/patches/11_Makefile.am_use_only_used_libs.diff
kde-extras/kipi-plugins/trunk/debian/patches/12_kdesvn492745_fix_printing_printwizard.diff
Log:
o Remove old patches which are obsolete now.
o move the makefile patch after the pull-upstream-patch
o adjust makefile patch for the new plugin simpleviewer
o add png for simpleviewer
Deleted: kde-extras/kipi-plugins/trunk/debian/patches/10_kdesvn492067_fix_crash_for_canceling_dialog_imagesgallery.diff
Deleted: kde-extras/kipi-plugins/trunk/debian/patches/11_Makefile.am_use_only_used_libs.diff
Deleted: kde-extras/kipi-plugins/trunk/debian/patches/12_kdesvn492745_fix_printing_printwizard.diff
Copied: kde-extras/kipi-plugins/trunk/debian/patches/14_Makefile.am_use_only_used_libs.diff (from rev 2891, kde-extras/kipi-plugins/trunk/debian/patches/11_Makefile.am_use_only_used_libs.diff)
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/11_Makefile.am_use_only_used_libs.diff 2006-01-15 19:34:17 UTC (rev 2891)
+++ kde-extras/kipi-plugins/trunk/debian/patches/14_Makefile.am_use_only_used_libs.diff 2006-01-15 21:14:42 UTC (rev 2894)
@@ -0,0 +1,218 @@
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/acquireimages/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/acquireimages/Makefile.am 2005-12-30 20:05:04.000000000 +0100
+@@ -8,7 +8,7 @@
+ kipiplugin_acquireimages_la_SOURCES = plugin_acquireimages.cpp acquireimagedialog.cpp screenshotdialog.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_acquireimages_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS) $(LIB_TIFF)
++kipiplugin_acquireimages_la_LIBADD = $(LIB_TIFF) $(LIB_X11) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_acquireimages_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/batchprocessimages/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/batchprocessimages/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -20,7 +20,7 @@
+ renameimagesbase.ui renameimageswidget.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_batchprocessimages_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_batchprocessimages_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_batchprocessimages_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/calendar/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/calendar/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -9,8 +9,7 @@
+ calwidget.cpp calpainter.cpp calselect.cpp \
+ monthwidget.cpp
+
+-kipiplugin_calendar_la_LIBADD = $(LIB_KPARTS) \
+- -lkdeprint $(LIBKIPI_LIBS)
++kipiplugin_calendar_la_LIBADD = $(LIB_KDEPRINT) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ kipiplugin_calendar_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/cdarchiving/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/cdarchiving/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -10,7 +10,7 @@
+ kipiplugin_cdarchiving_la_SOURCES = plugin_cdarchiving.cpp cdarchivingdialog.cpp cdarchiving.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_cdarchiving_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_cdarchiving_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_cdarchiving_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/findimages/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/findimages/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -11,7 +11,7 @@
+ finddupplicateimages.cpp finddupplicatedialog.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_findimages_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_findimages_la_LIBADD = -lkdefx $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_findimages_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/flickrexport/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/flickrexport/Makefile.am 2005-12-30 21:58:54.000000000 +0100
+@@ -11,8 +11,7 @@
+ flickrwidget.cpp mpform.cpp flickralbumdialog.ui \
+ flickrviewitem.cpp
+
+-kipiplugin_flickrexport_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS) \
+- $(LIB_KHTML)
++kipiplugin_flickrexport_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ kipiplugin_flickrexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/galleryexport/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/galleryexport/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -11,8 +11,7 @@
+ gallerywidget.cpp gallerympform.cpp galleryalbumdialog.ui \
+ galleryviewitem.cpp
+
+-kipiplugin_galleryexport_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS) \
+- $(LIB_KHTML)
++kipiplugin_galleryexport_la_LIBADD = -lkwalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ kipiplugin_galleryexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/helloworld/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/helloworld/Makefile.am 2005-12-30 22:04:23.000000000 +0100
+@@ -8,7 +8,7 @@
+ kipiplugin_helloworld_la_SOURCES = plugin_helloworld.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_helloworld_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_helloworld_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_helloworld_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/imagesgallery/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/imagesgallery/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -9,7 +9,7 @@
+ imagesgallery.cpp exifrestorer.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_imagesgallery_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_imagesgallery_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_imagesgallery_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/jpeglossless/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/jpeglossless/Makefile.am 2005-12-30 22:02:24.000000000 +0100
+@@ -11,8 +11,7 @@
+ imagerotate.cpp convert2grayscale.cpp imageflip.cpp \
+ messagebox.cpp jpegtransform.cpp
+
+-kipiplugin_jpeglossless_la_LIBADD = $(LIB_KPARTS) \
+- -ljpeg $(LIBKIPI_LIBS) $(LIBKEXIF_LIBS) $(LIB_TIFF)
++kipiplugin_jpeglossless_la_LIBADD = -lkdefx -ljpeg $(LIBKEXIF_LIBS) $(LIB_TIFF) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ kipiplugin_jpeglossless_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/kameraklient/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/kameraklient/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -7,7 +7,7 @@
+ kde_module_LTLIBRARIES = kipiplugin_kameraklient.la
+ kipiplugin_kameraklient_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
+
+-kipiplugin_kameraklient_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEUI) $(LIBKIPI_LIBS) $(LIB_GPHOTO)
++kipiplugin_kameraklient_la_LIBADD = $(LIB_GPHOTO) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ kipiplugin_kameraklient_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/mpegencoder/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/mpegencoder/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -10,7 +10,7 @@
+ optionsdialog.cpp checkbinprog.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_mpegencoder_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_mpegencoder_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_mpegencoder_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/printwizard/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/printwizard/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -6,8 +6,8 @@
+ kipiplugin_printwizard_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
+ kipiplugin_printwizard_la_SOURCES = frmprintwizardbase.ui plugin_printwizard.cpp frmprintwizard.cpp cropframe.cpp tphoto.cpp utils.cpp
+
+-#kipiplugin_printwizard_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_KDECORE) $(top_builddir)/libkipi/libkipi/libkipi.la
+-kipiplugin_printwizard_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIBKIPI_LIBS)
++#LIBKIPI_LIBS = $(top_builddir)/libkipi/libkipi/libkipi.la
++kipiplugin_printwizard_la_LIBADD = $(LIB_KDEPRINT) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ kipiplugin_printwizard_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/rawconverter/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/rawconverter/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -10,7 +10,7 @@
+ processcontroller.cpp dmessagebox.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_rawconverter_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_rawconverter_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_rawconverter_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/sendimages/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/sendimages/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -10,7 +10,7 @@
+ exifrestorer.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_sendimages_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_sendimages_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_sendimages_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/slideshow/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/slideshow/Makefile.am 2005-12-30 22:15:32.000000000 +0100
+@@ -10,8 +10,8 @@
+ slideshow.cpp slideshowconfig.cpp imlibiface.cpp \
+ slideshowgl.cpp toolbar.cpp
+
+-kipiplugin_slideshow_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS) \
+- $(LIB_IMLIB2) $(GL_LIBS)
++#kipiplugin_slideshow_la_LIBADD = -lkdefx $(LIB_IMLIB2) $(GL_LIBS) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
++kipiplugin_slideshow_la_LIBADD = -lkdefx -lImlib2 $(GL_LIBS) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ kipiplugin_slideshow_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/timeadjust/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/timeadjust/Makefile.am 2005-12-30 22:03:28.000000000 +0100
+@@ -8,7 +8,7 @@
+ kipiplugin_timeadjust_la_SOURCES = plugin_timeadjust.cpp timeadjustdialog.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_timeadjust_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS) $(LIBKEXIF_LIBS)
++kipiplugin_timeadjust_la_LIBADD = $(LIBKEXIF_LIBS) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_timeadjust_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/wallpaper/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/wallpaper/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -5,7 +5,7 @@
+ kipiplugin_wallpaper_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
+ kipiplugin_wallpaper_la_SOURCES = plugin_wallpaper.cpp
+
+-kipiplugin_wallpaper_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_wallpaper_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ kipiplugin_wallpaper_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
+--- kipi-plugins-0.1+rc1/kipi-plugins/simpleviewerexport/Makefile.am (revision 498549)
++++ kipi-plugins-0.1+rc1/kipi-plugins/simpleviewerexport/Makefile.am (working copy)
+@@ -9,7 +9,7 @@
+ simpleviewerexport.cpp firstrundlg.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_simpleviewer_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_simpleviewer_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_simpleviewer_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
Added: kde-extras/kipi-plugins/trunk/debian/patches/space.png.tar.gz.uu
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/space.png.tar.gz.uu 2006-01-15 21:12:34 UTC (rev 2893)
+++ kde-extras/kipi-plugins/trunk/debian/patches/space.png.tar.gz.uu 2006-01-15 21:14:42 UTC (rev 2894)
@@ -0,0 +1,10 @@
+begin 644 space.png.tar.gz
+M'XL(`$6RRD,``^W1L4[#,!`&X"L4%%5TRP)37J#(;IIV@(&@1!`)0I5V@(FZ
+MU,T44EJCPLI6'@9>HT@\`&)C0>(MN#`@)I at J5.G_)/ON[)-EV9.1NM#;H\N4
+M%D>P9J-11-GRQ,_XI>Y*DL)MUCU7"D^2D-+E)4<L\$[?KB=&C1V'3)ZIW_K^
+MVE]2LW9\4*UL53BM1H=!PK%4#&N5I_/G<HV+<NH?^T2/\];:_0?7FR8\-9U\
+M:*9JK,D?Y'WM1)E*=:+5X/;J2>]RTWK[J!O:MLWI=,>:%V>:).[0WOO+D(N-
+M*/"[-Z_]'EG\S2M4.LG.WHH+16$</.SW[O[I/0``````````````````````
+,`);%)QDZ0IH`*```
+`
+end
More information about the pkg-kde-commits
mailing list