Update of /cvsroot/fink/experimental/rangerrick/10.4/crypto/finkinfo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv736/10.4/crypto/finkinfo
Modified Files: kdepim3.info kdepim3.patch Log Message: wip Index: kdepim3.patch =================================================================== RCS file: /cvsroot/fink/experimental/rangerrick/10.4/crypto/finkinfo/kdepim3.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- kdepim3.patch 30 Nov 2005 15:43:04 -0000 1.11 +++ kdepim3.patch 1 Dec 2005 23:02:07 -0000 1.12 @@ -1,34 +1,3 @@ ---- kdepim-3.5.0/akregator/src/Makefile.am 2005-10-10 11:02:17.000000000 -0400 -+++ kdepim-3.5.0-new/akregator/src/Makefile.am 2005-11-28 11:44:10.000000000 -0500 -@@ -16,12 +16,13 @@ - ######################################################################### - # this is the program that gets installed. it's name is used for all - # of the other Makefile.am variables --bin_PROGRAMS = akregator -+bin_PROGRAMS = -+kdeinit_LTLIBRARIES = akregator.la - - # the application source, library search path, and link libraries --akregator_SOURCES = main.cpp mainwindow.cpp --akregator_LDFLAGS = $(KDE_RPATH) $(all_libraries) --akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la -+akregator_la_SOURCES = main.cpp mainwindow.cpp -+akregator_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -+akregator_la_LIBADD = $(LIB_KPARTS) libakregatorprivate.la - #akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libkdepim/libkdepim.la - - # this is where the desktop file will go ---- kdepim-3.5.0/akregator/src/main.cpp 2005-09-10 04:23:38.000000000 -0400 -+++ kdepim-3.5.0-new/akregator/src/main.cpp 2005-11-28 11:43:53.000000000 -0500 -@@ -83,7 +83,7 @@ - - } // namespace Akregator - --int main(int argc, char **argv) -+extern "C" int kdemain(int argc, char **argv) - { - Akregator::AboutData about; - KCmdLineArgs::init(argc, argv, &about); --- kdepim-3.5.0/certmanager/Makefile.am 2005-09-10 04:23:51.000000000 -0400 +++ kdepim-3.5.0-new/certmanager/Makefile.am 2005-11-28 11:41:31.000000000 -0500 @@ -4,9 +4,11 @@ @@ -204,49 +173,6 @@ { KLocale::setMainCatalogue( "kaddressbook" ); ---- kdepim-3.5.0/kalarm/Makefile.am 2005-10-10 11:02:22.000000000 -0400 -+++ kdepim-3.5.0-new/kalarm/Makefile.am 2005-11-28 13:13:18.000000000 -0500 -@@ -8,10 +8,13 @@ - -I$(top_srcdir)/libkmime \ - -I$(top_srcdir)/certmanager/lib $(all_includes) - --bin_PROGRAMS = kalarm -+bin_PROGRAMS = -+lib_LTLIBRARIES = -+kdeinit_LTLIBRARIES = kalarm.la -+ - # Don't change the order of the kalarm_SOURCES files without first checking - # that it builds with --enable-final !!! --kalarm_SOURCES = birthdaydlg.cpp main.cpp alarmevent.cpp editdlg.cpp \ -+kalarm_la_SOURCES = birthdaydlg.cpp main.cpp alarmevent.cpp editdlg.cpp \ - soundpicker.cpp sounddlg.cpp alarmcalendar.cpp daemon.cpp undo.cpp \ - kalarmapp.cpp mainwindowbase.cpp mainwindow.cpp messagewin.cpp \ - preferences.cpp prefdlg.cpp kalarmiface.skel \ -@@ -23,11 +26,11 @@ - templatelistview.cpp templatepickdlg.cpp templatedlg.cpp \ - templatemenuaction.cpp latecancel.cpp repetition.cpp alarmtext.cpp \ - emailidcombo.cpp find.cpp pickfileradio.cpp calendarcompat.cpp --kalarm_LDFLAGS = $(all_libraries) $(KDE_RPATH) -+kalarm_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module - if include_ARTS - ARTSLIB = -lartskde - endif --kalarm_LDADD = $(top_builddir)/kalarm/lib/libkalarm.la \ -+kalarm_la_LIBADD = $(top_builddir)/kalarm/lib/libkalarm.la \ - $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/libkmime/libkmime.la \ - $(top_builddir)/kalarm/kalarmd/libkalarmd.la \ ---- kdepim-3.5.0/kalarm/main.cpp 2005-09-10 04:24:14.000000000 -0400 -+++ kdepim-3.5.0-new/kalarm/main.cpp 2005-11-28 11:41:31.000000000 -0500 -@@ -101,7 +101,7 @@ - }; - - --int main(int argc, char *argv[]) -+extern "C" int kdemain(int argc, char *argv[]) - { - KAboutData aboutData(PROGRAM_NAME, I18N_NOOP("KAlarm"), KALARM_VERSION, - I18N_NOOP("Personal alarm message, command and email scheduler for KDE"), --- kdepim-3.5.0/kandy/src/Makefile.am 2005-09-10 04:24:42.000000000 -0400 +++ kdepim-3.5.0-new/kandy/src/Makefile.am 2005-11-28 11:49:19.000000000 -0500 @@ -1,10 +1,12 @@ @@ -1176,7 +1102,7 @@ libexchangewizard.la --- kdepim-3.5.0/kmail/Makefile.am 2005-11-08 17:33:29.000000000 -0500 -+++ kdepim-3.5.0-new/kmail/Makefile.am 2005-11-30 08:21:10.000000000 -0500 ++++ kdepim-3.5.0-new/kmail/Makefile.am 2005-11-30 11:04:28.000000000 -0500 @@ -29,15 +29,15 @@ ../libkpimidentities/libkpimidentities.la ../mimelib/libmimelib.la \ ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \ @@ -1211,3 +1137,52 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \ configuredialog_p.cpp klistviewindexedsearchline.cpp \ +@@ -126,7 +128,7 @@ + managesievescriptsdialog.cpp chiasmuskeyselector.cpp \ + util.cpp + +-kmail_SOURCES = main.cpp ++kmail_la_SOURCES = main.cpp + + libkmailpart_la_SOURCES = kmailpartIface.skel kmail_part.cpp + +--- kdepim-3.5.0/akregator/src/Makefile.am 2005-10-10 11:02:17.000000000 -0400 ++++ kdepim-3.5.0-new/akregator/src/Makefile.am 2005-12-01 08:25:26.000000000 -0500 +@@ -16,12 +16,13 @@ + ######################################################################### + # this is the program that gets installed. it's name is used for all + # of the other Makefile.am variables +-bin_PROGRAMS = akregator ++bin_PROGRAMS = ++kdeinit_LTLIBRARIES = akregator.la + + # the application source, library search path, and link libraries +-akregator_SOURCES = main.cpp mainwindow.cpp +-akregator_LDFLAGS = $(KDE_RPATH) $(all_libraries) +-akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la ++akregator_la_SOURCES = main.cpp mainwindow.cpp ++akregator_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module ++akregator_la_LIBADD = $(LIB_KPARTS) libakregatorprivate.la + #akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libkdepim/libkdepim.la + + # this is where the desktop file will go +@@ -75,7 +76,7 @@ + dragobjects.cpp \ + utils.cpp + +-libakregatorprivate_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined ++libakregatorprivate_la_LDFLAGS = $(all_libraries) -no-undefined + libakregatorprivate_la_LIBADD = $(top_builddir)/libkdepim/libkdepim.la \ + $(top_builddir)/akregator/src/librss/librsslocal.la $(LIB_KHTML) + +--- kdepim-3.5.0/akregator/src/main.cpp 2005-09-10 04:23:38.000000000 -0400 ++++ kdepim-3.5.0-new/akregator/src/main.cpp 2005-12-01 08:14:54.000000000 -0500 +@@ -83,7 +83,7 @@ + + } // namespace Akregator + +-int main(int argc, char **argv) ++extern "C" int kdemain(int argc, char **argv) + { + Akregator::AboutData about; + KCmdLineArgs::init(argc, argv, &about); Index: kdepim3.info =================================================================== RCS file: /cvsroot/fink/experimental/rangerrick/10.4/crypto/finkinfo/kdepim3.info,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- kdepim3.info 29 Nov 2005 14:53:12 -0000 1.36 +++ kdepim3.info 1 Dec 2005 23:02:07 -0000 1.37 @@ -143,17 +143,22 @@ lib/kde3/*akregator* lib/libakregator* lib/libkdeinit_akregator* - share/applnk/Internet/akregator.desktop share/apps/akregator share/config.kcfg/akregator* share/doc/kde/en/akregator - share/icons/crystalsvg/128x128/apps/akregator* - share/icons/crystalsvg/16x16/apps/akregator* - share/icons/crystalsvg/22x22/apps/akregator* - share/icons/crystalsvg/32x32/apps/akregator* - share/icons/crystalsvg/48x48/apps/akregator* - share/icons/crystalsvg/64x64/apps/akregator* - share/icons/crystalsvg/scalable/apps/akregator* + share/icons/hicolor/128x128/apps/akregator* + share/icons/hicolor/16x16/apps/akregator* + share/icons/hicolor/22x22/apps/akregator* + share/icons/hicolor/32x32/apps/akregator* + share/icons/hicolor/48x48/apps/akregator* + share/icons/hicolor/64x64/apps/akregator* + share/icons/hicolor/scalable/apps/akregator* + share/icons/crystalsvg/16x16/apps/akregator_empty* + share/icons/crystalsvg/16x16/actions/rss_tag* + share/icons/crystalsvg/22x22/actions/rss_tag* + share/icons/crystalsvg/32x32/actions/rss_tag* + share/icons/crystalsvg/48x48/actions/rss_tag* + share/icons/crystalsvg/64x64/actions/rss_tag* share/services/akregator* share/services/feed.protocol << @@ -186,6 +191,9 @@ share/icons/crystalsvg/16x16/apps/gpg* share/icons/crystalsvg/22x22/apps/gpg* share/icons/crystalsvg/32x32/apps/gpg* + share/icons/crystalsvg/16x16/apps/gpgsm* + share/icons/crystalsvg/22x22/apps/gpgsm* + share/icons/crystalsvg/32x32/apps/gpgsm* share/services/*kleopatra* << DescDetail: << @@ -217,11 +225,11 @@ share/applications/kde/kaddressbook* share/apps/kaddressbook share/doc/kde/en/kaddressbook - share/icons/crystalsvg/128x128/apps/kaddressbook* - share/icons/crystalsvg/16x16/apps/kaddressbook* - share/icons/crystalsvg/32x32/apps/kaddressbook* - share/icons/crystalsvg/48x48/apps/kaddressbook* - share/icons/crystalsvg/64x64/apps/kaddressbook* + share/icons/hicolor/128x128/apps/kaddressbook* + share/icons/hicolor/16x16/apps/kaddressbook* + share/icons/hicolor/32x32/apps/kaddressbook* + share/icons/hicolor/48x48/apps/kaddressbook* + share/icons/hicolor/64x64/apps/kaddressbook* share/services/kab* share/services/kaddressbook share/services/ldifvcard* @@ -255,10 +263,10 @@ share/autostart/kalarm* share/doc/kde/en/kalarm share/icons/crystalsvg/16x16/actions/kalarm* - share/icons/crystalsvg/16x16/apps/kalarm* share/icons/crystalsvg/22x22/actions/kalarm* - share/icons/crystalsvg/32x32/apps/kalarm* - share/icons/crystalsvg/48x48/apps/kalarm* + share/icons/hicolor/16x16/apps/kalarm* + share/icons/hicolor/32x32/apps/kalarm* + share/icons/hicolor/48x48/apps/kalarm* << Homepage: http://pim.kde.org/components/kalarm.php DescDetail: << @@ -304,11 +312,12 @@ share/applnk/Utilities/karm* share/apps/karm share/doc/kde/en/karm - share/icons/crystalsvg/128x128/apps/karm* - share/icons/crystalsvg/16x16/apps/karm* - share/icons/crystalsvg/32x32/apps/karm* - share/icons/crystalsvg/48x48/apps/karm* - share/icons/crystalsvg/64x64/apps/karm* + share/icons/hicolor/128x128/apps/karm* + share/icons/hicolor/16x16/apps/karm* + share/icons/hicolor/22x22/apps/karm* + share/icons/hicolor/32x32/apps/karm* + share/icons/hicolor/48x48/apps/karm* + share/icons/hicolor/64x64/apps/karm* << Homepage: http://pim.kde.org/components/karm.php DescDetail: << @@ -377,10 +386,10 @@ share/apps/konqueror/servicemenus/kitchensync-* share/apps/multisynk share/doc/kde/en/multisynk - share/icons/crystalsvg/16x16/apps/multisynk* - share/icons/crystalsvg/22x22/apps/multisynk* - share/icons/crystalsvg/32x32/apps/multisynk* - share/icons/crystalsvg/48x48/apps/multisynk* + share/icons/hicolor/16x16/apps/multisynk* + share/icons/hicolor/22x22/apps/multisynk* + share/icons/hicolor/32x32/apps/multisynk* + share/icons/hicolor/48x48/apps/multisynk* share/services/kitchensync share/services/kresources/konnector/kabckonnector* share/services/kresources/konnector/kcalkonnector* @@ -425,13 +434,18 @@ share/config.kcfg/replyphrases* share/config/kmail* share/doc/kde/en/kmail - share/icons/crystalsvg/128x128/apps/kmail* - share/icons/crystalsvg/16x16/apps/kmail* - share/icons/crystalsvg/22x22/apps/kmail* - share/icons/crystalsvg/32x32/apps/kmail* - share/icons/crystalsvg/48x48/apps/kmail* - share/icons/crystalsvg/64x64/apps/kmail* - share/icons/crystalsvg/scalable/apps/kmail* + share/icons/hicolor/128x128/apps/kmail* + share/icons/hicolor/16x16/apps/kmail* + share/icons/hicolor/22x22/apps/kmail* + share/icons/hicolor/32x32/apps/kmail* + share/icons/hicolor/48x48/apps/kmail* + share/icons/hicolor/64x64/apps/kmail* + share/icons/hicolor/scalable/apps/kmail* + share/icons/crystalsvg/16x16/apps/kmailcvt* + share/icons/crystalsvg/32x32/apps/kmailcvt* + share/icons/crystalsvg/48x48/apps/kmailcvt* + share/icons/crystalsvg/22x22/apps/kmaillight* + share/icons/crystalsvg/32x32/apps/kmaillight* share/services/kmail* share/servicetypes/dcopimap* share/servicetypes/dcopmail* @@ -460,11 +474,11 @@ share/applications/kde/KNode* share/apps/knode share/doc/kde/en/knode - share/icons/crystalsvg/128x128/apps/knode* - share/icons/crystalsvg/16x16/apps/knode* - share/icons/crystalsvg/32x32/apps/knode* - share/icons/crystalsvg/48x48/apps/knode* - share/icons/crystalsvg/64x64/apps/knode* + share/icons/hicolor/128x128/apps/knode* + share/icons/hicolor/16x16/apps/knode* + share/icons/hicolor/32x32/apps/knode* + share/icons/hicolor/48x48/apps/knode* + share/icons/hicolor/64x64/apps/knode* share/services/knewsservice* share/services/knode* << @@ -493,12 +507,12 @@ share/config.kcfg/knoteconfig* share/config.kcfg/knotesglobalconfig* share/doc/kde/en/knotes - share/icons/crystalsvg/128x128/apps/knotes* - share/icons/crystalsvg/16x16/apps/knotes* - share/icons/crystalsvg/22x22/apps/knotes* - share/icons/crystalsvg/32x32/apps/knotes* - share/icons/crystalsvg/48x48/apps/knotes* - share/icons/crystalsvg/64x64/apps/knotes* + share/icons/hicolor/128x128/apps/knotes* + share/icons/hicolor/16x16/apps/knotes* + share/icons/hicolor/22x22/apps/knotes* + share/icons/hicolor/32x32/apps/knotes* + share/icons/hicolor/48x48/apps/knotes* + share/icons/hicolor/64x64/apps/knotes* share/services/kresources/knotes* << Homepage: http://pim.kde.org/components/knotes.php @@ -552,17 +566,17 @@ share/apps/kontact* share/config.kcfg/kontact* share/doc/kde/en/kontact - share/icons/crystalsvg/128x128/apps/kontact* + share/icons/hicolor/128x128/apps/kontact* + share/icons/hicolor/16x16/apps/kontact* + share/icons/hicolor/22x22/apps/kontact* + share/icons/hicolor/32x32/apps/kontact* + share/icons/hicolor/48x48/apps/kontact* + share/icons/hicolor/64x64/apps/kontact* share/icons/crystalsvg/16x16/actions/kontact* - share/icons/crystalsvg/16x16/apps/kontact* share/icons/crystalsvg/22x22/actions/kontact* - share/icons/crystalsvg/22x22/apps/kontact* share/icons/crystalsvg/32x32/actions/kontact* - share/icons/crystalsvg/32x32/apps/kontact* share/icons/crystalsvg/48x48/actions/kontact* - share/icons/crystalsvg/48x48/apps/kontact* share/icons/crystalsvg/64x64/actions/kontact* - share/icons/crystalsvg/64x64/apps/kontact* share/services/kcmkabsummary* share/services/kcmkmailsummary* share/services/kcmkontact* @@ -615,11 +629,11 @@ share/autostart/korgac* share/config.kcfg/korganizer* share/doc/kde/en/korganizer - share/icons/crystalsvg/128x128/apps/korganizer* - share/icons/crystalsvg/16x16/apps/korganizer* - share/icons/crystalsvg/32x32/apps/korganizer* - share/icons/crystalsvg/48x48/apps/korganizer* - share/icons/crystalsvg/64x64/apps/korganizer* + share/icons/hicolor/128x128/apps/korganizer* + share/icons/hicolor/16x16/apps/korganizer* + share/icons/hicolor/32x32/apps/korganizer* + share/icons/hicolor/48x48/apps/korganizer* + share/icons/hicolor/64x64/apps/korganizer* share/services/korganizer* share/services/webcal.* share/servicetypes/calendar* @@ -654,9 +668,9 @@ share/applications/kde/KOrn* share/apps/kconf_update/korn* share/doc/kde/en/korn - share/icons/crystalsvg/16x16/apps/korn* - share/icons/crystalsvg/32x32/apps/korn* - share/icons/crystalsvg/48x48/apps/korn* + share/icons/hicolor/16x16/apps/korn* + share/icons/hicolor/32x32/apps/korn* + share/icons/hicolor/48x48/apps/korn* << Homepage: http://www.ph.unimelb.edu.au/~ssk/kde/korn/ DescDetail: << @@ -700,14 +714,18 @@ share/config.kcfg/vcalconduit* share/doc/kde/en/kpilot share/icons/crystalsvg/16x16/apps/kpalmdoc* - share/icons/crystalsvg/16x16/apps/kpilot* share/icons/crystalsvg/22x22/apps/kpalmdoc* - share/icons/crystalsvg/22x22/apps/kpilot* share/icons/crystalsvg/32x32/apps/kpalmdoc* - share/icons/crystalsvg/32x32/apps/kpilot* share/icons/crystalsvg/48x48/apps/kpalmdoc* - share/icons/crystalsvg/48x48/apps/kpilot* + share/icons/hicolor/16x16/apps/kpilot* + share/icons/hicolor/22x22/apps/kpilot* + share/icons/hicolor/32x32/apps/kpilot* + share/icons/hicolor/48x48/apps/kpilot* share/icons/locolor/16x16/apps/kpilot* + share/icons/crystalsvg/16x16/apps/kpilotDaemon* + share/icons/crystalsvg/22x22/apps/kpilotDaemon* + share/icons/crystalsvg/32x32/apps/kpilotDaemon* + share/icons/crystalsvg/48x48/apps/kpilotDaemon* share/services/abbrowser_conduit* share/services/doc_conduit* share/services/knotes-conduit* @@ -873,6 +891,8 @@ share/apps/libkdepim share/apps/libkholidays share/config.kcfg/pimemoticons* + share/icons/crystalsvg/22x22/actions/button_fewer* + share/icons/crystalsvg/22x22/actions/button_more* share/services/groupwise* share/services/kded/networkstatus* share/services/kresources/kabc/imap* ------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits