Ticket #10933: kde354_2.patch

File kde354_2.patch, 194.2 KB (added by takanori@…, 18 years ago)

  • kdegraphics3/files/InstallScript.sh

     
    11#!/bin/sh -e
    22
    3         export PREFIX="%p"
     3        export PREFIX="%p" USE_UNSERMAKE=1
    44        . ./environment-helper.sh
    55
    6 #darwinports
    7         export UNSERMAKE="no"
     6        ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
    87
    9         ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
    10 
    118        mkdir -p %i/share/doc/installed-packages
    129        touch %i/share/doc/installed-packages/%N
    1310        touch %i/share/doc/installed-packages/%N-base

  • kdegraphics3/files/kdegraphics3.patch

     
    1 --- kdegraphics-3.5.0/kcoloredit/Makefile.am    2005-09-10 04:18:59.000000000 -0400
    2 +++ kdegraphics-3.5.0-new/kcoloredit/Makefile.am        2005-11-22 13:52:45.000000000 -0500
     1
     2--- kdegraphics-3.5.4/kcoloredit/Makefile.am    2006-07-22 04:10:29.000000000 -0400
     3+++ kdegraphics-3.5.4-new/kcoloredit/Makefile.am        2006-07-31 01:04:48.000000000 -0400
    34@@ -1,21 +1,24 @@
    45 INCLUDES = $(all_includes)
    56 
    … …  
    89        texteditselection.cpp gradientselection.cpp colorselector.cpp \
    910        kxycolorselector.cpp paletteview.cpp paletteviewscrolledarea.cpp \
    1011        editablestreamhistory.cpp color.cpp palette.cpp loadpalettedlg.cpp \
    11         kcoloreditview.cpp kcoloreditdoc.cpp kcoloredit.cpp main.cpp 
     12        kcoloreditview.cpp kcoloreditdoc.cpp kcoloredit.cpp main.cpp
    1213-kcoloredit_METASOURCES = AUTO
    1314-kcoloredit_LDADD = $(LIB_KDEUI) $(LIB_KFILE)
    1415-kcoloredit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
    1516+kcoloredit_la_METASOURCES = AUTO
    1617+kcoloredit_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE)
    17 +kcoloredit_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
     18+kcoloredit_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN)
    1819 
    1920 rcdir = $(kde_datadir)/kcoloredit
    2021 rc_DATA = kcoloreditui.rc
    … …  
    2425-kcolorchooser_LDADD = $(LIB_KDEUI)
    2526-kcolorchooser_LDFLAGS = $(all_libraries) $(KDE_RPATH)
    2627+bin_PROGRAMS =
    27 +lib_LTLIBRARIES =
     28+lib_LTLIBRARIES = 
    2829+kdeinit_LTLIBRARIES = kcoloredit.la kcolorchooser.la
    2930+
    3031+kcolorchooser_la_SOURCES = kcolorchooser.cpp
    3132+kcolorchooser_la_LIBADD = $(LIB_KDEUI)
    32 +kcolorchooser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
     33+kcolorchooser_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN)
    3334 
    3435 noinst_HEADERS = color.h colorselector.h editablestreamhistory.h \
    3536        gradientselection.h imageselection.h kcoloredit.h kcoloreditdoc.h \
    36 --- kdegraphics-3.5.0/kcoloredit/kcolorchooser.cpp      2005-09-10 04:18:59.000000000 -0400
    37 +++ kdegraphics-3.5.0-new/kcoloredit/kcolorchooser.cpp  2005-11-22 13:52:45.000000000 -0500
     37--- kdegraphics-3.5.4/kcoloredit/kcolorchooser.cpp      2005-09-10 04:18:59.000000000 -0400
     38+++ kdegraphics-3.5.4-new/kcoloredit/kcolorchooser.cpp  2006-07-31 01:03:32.000000000 -0400
    3839@@ -41,7 +41,7 @@
    3940    KCmdLineLastOption
    4041 };
    … …  
    4445 {
    4546   KLocale::setMainCatalogue("kdelibs");
    4647   KAboutData aboutData( "kcolorchooser", I18N_NOOP("KColorChooser"),
    47 --- kdegraphics-3.5.0/kcoloredit/main.cpp       2005-09-10 04:18:59.000000000 -0400
    48 +++ kdegraphics-3.5.0-new/kcoloredit/main.cpp   2005-11-22 13:52:45.000000000 -0500
     48--- kdegraphics-3.5.4/kcoloredit/main.cpp       2005-09-10 04:18:59.000000000 -0400
     49+++ kdegraphics-3.5.4-new/kcoloredit/main.cpp   2006-07-31 01:03:32.000000000 -0400
    4950@@ -34,7 +34,7 @@
    5051   // INSERT YOUR COMMANDLINE OPTIONS HERE
    5152 };
    … …  
    5556 {
    5657 
    5758        KAboutData aboutData( "kcoloredit", I18N_NOOP("KColorEdit"),
    58 --- kdegraphics-3.5.0/kdvi/Makefile.am  2005-09-10 04:18:58.000000000 -0400
    59 +++ kdegraphics-3.5.0-new/kdvi/Makefile.am      2005-11-22 13:52:45.000000000 -0500
     59--- kdegraphics-3.5.4/kdvi/Makefile.am  2005-09-10 04:18:58.000000000 -0400
     60+++ kdegraphics-3.5.4-new/kdvi/Makefile.am      2006-07-31 01:03:32.000000000 -0400
    6061@@ -1,11 +1,13 @@
    6162 # set the include path for X, qt and KDE
    6263 INCLUDES= -I$(top_srcdir)/kviewshell \
    … …  
    8687 
    8788 ## this option you can leave out. Just, if you use "make dist", you need it
    8889 noinst_HEADERS = dvi.h dviRenderer.h xdvi.h
    89 --- kdegraphics-3.5.0/kdvi/main.cpp     2005-11-08 17:25:52.000000000 -0500
    90 +++ kdegraphics-3.5.0-new/kdvi/main.cpp 2005-11-22 13:52:46.000000000 -0500
     90--- kdegraphics-3.5.4/kdvi/main.cpp     2005-11-08 17:25:52.000000000 -0500
     91+++ kdegraphics-3.5.4-new/kdvi/main.cpp 2006-07-31 01:03:32.000000000 -0400
    9192@@ -29,7 +29,7 @@
    9293 static const char description[] = I18N_NOOP("A previewer for Device Independent files (DVI files) produced by the TeX typesetting system.");
    9394 
    … …  
    9798 {
    9899   KAboutData about ("kdvi", I18N_NOOP("KDVI"), "1.4",
    99100                     description, KAboutData::License_GPL,
    100 --- kdegraphics-3.5.0/kfax/Makefile.am  2005-10-10 10:56:54.000000000 -0400
    101 +++ kdegraphics-3.5.0-new/kfax/Makefile.am      2005-11-22 13:52:46.000000000 -0500
     101--- kdegraphics-3.5.4/kfax/Makefile.am  2005-10-10 10:56:54.000000000 -0400
     102+++ kdegraphics-3.5.4-new/kfax/Makefile.am      2006-07-31 01:03:32.000000000 -0400
    102103@@ -1,16 +1,18 @@
    103104-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
    104105-LDADD      = $(LIB_KFILE) $(LIB_KDEPRINT) -lm
    … …  
    122123 
    123124 xdg_apps_DATA = kfax.desktop
    124125 
    125 --- kdegraphics-3.5.0/kfax/kfax.cpp     2005-10-10 10:56:54.000000000 -0400
    126 +++ kdegraphics-3.5.0-new/kfax/kfax.cpp 2005-11-22 13:52:46.000000000 -0500
    127 @@ -1682,7 +1682,7 @@
     126--- kdegraphics-3.5.4/kfax/kfax.cpp     2006-07-22 04:10:31.000000000 -0400
     127+++ kdegraphics-3.5.4-new/kfax/kfax.cpp 2006-07-31 01:03:32.000000000 -0400
     128@@ -1646,7 +1646,7 @@
    128129    KCmdLineLastOption
    129130 };
    130131 
    … …  
    133134 {
    134135   KAboutData aboutData( "kfax", I18N_NOOP("KFax"),
    135136       KFAXVERSION, description, KAboutData::License_GPL,
    136 --- kdegraphics-3.5.0/kfile-plugins/png/Makefile.am     2005-09-10 04:19:24.000000000 -0400
    137 +++ kdegraphics-3.5.0-new/kfile-plugins/png/Makefile.am 2005-11-22 13:52:47.000000000 -0500
     137--- kdegraphics-3.5.4/kfaxview/libkfaximage/Makefile.am 2005-09-10 04:18:44.000000000 -0400
     138+++ kdegraphics-3.5.4-new/kfaxview/libkfaximage/Makefile.am     2006-07-31 01:03:32.000000000 -0400
     139@@ -1,7 +1,7 @@
     140 INCLUDES = -I$(top_srcdir) $(all_includes)
     141 
     142 lib_LTLIBRARIES = libkfaximage.la
     143-libkfaximage_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
     144+libkfaximage_la_LDFLAGS = $(all_libraries) -no-undefined
     145 libkfaximage_la_LIBADD  = $(LIB_KDECORE)
     146 libkfaximage_la_SOURCES = kfaximage.cpp faxexpand.cpp faxinit.cpp
     147 
     148--- kdegraphics-3.5.4/kfile-plugins/png/Makefile.am     2005-09-10 04:19:24.000000000 -0400
     149+++ kdegraphics-3.5.4-new/kfile-plugins/png/Makefile.am 2006-07-31 01:03:32.000000000 -0400
    138150@@ -10,7 +10,7 @@
    139151 
    140152 kfile_png_la_SOURCES = kfile_png.cpp
    … …  
    144156 
    145157 # let automoc handle all of the meta source files (moc)
    146158 METASOURCES = AUTO
    147 --- kdegraphics-3.5.0/kghostview/Makefile.am    2005-09-10 04:19:23.000000000 -0400
    148 +++ kdegraphics-3.5.0-new/kghostview/Makefile.am        2005-11-22 13:52:47.000000000 -0500
     159--- kdegraphics-3.5.4/kghostview/Makefile.am    2006-05-22 14:05:40.000000000 -0400
     160+++ kdegraphics-3.5.4-new/kghostview/Makefile.am        2006-07-31 01:03:32.000000000 -0400
    149161@@ -4,7 +4,8 @@
    150162 
    151163 ####### Files
    … …  
    169181 
    170182 libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined
    171183 libdscparse_la_LIBADD = $(LIB_QT)
    172 --- kdegraphics-3.5.0/kghostview/main.cpp       2005-10-10 10:56:55.000000000 -0400
    173 +++ kdegraphics-3.5.0-new/kghostview/main.cpp   2005-11-22 13:52:47.000000000 -0500
     184--- kdegraphics-3.5.4/kghostview/main.cpp       2005-10-10 10:56:55.000000000 -0400
     185+++ kdegraphics-3.5.4-new/kghostview/main.cpp   2006-07-31 01:03:32.000000000 -0400
    174186@@ -43,7 +43,7 @@
    175187     KCmdLineLastOption
    176188 };
    … …  
    180192 {
    181193     KCmdLineArgs::init( argc, argv, KGVPart::createAboutData() );
    182194     KCmdLineArgs::addCmdLineOptions( options );
    183 --- kdegraphics-3.5.0/kiconedit/Makefile.am     2005-09-10 04:19:24.000000000 -0400
    184 +++ kdegraphics-3.5.0-new/kiconedit/Makefile.am 2005-11-22 13:52:47.000000000 -0500
     195--- kdegraphics-3.5.4/kiconedit/Makefile.am     2006-03-17 05:11:23.000000000 -0500
     196+++ kdegraphics-3.5.4-new/kiconedit/Makefile.am 2006-07-31 01:03:32.000000000 -0400
    185197@@ -1,18 +1,20 @@
    186198 INCLUDES = $(all_includes)
    187199 SUBDIRS = pics
    … …  
    208220 
    209221 DISTCLEANFILES = *~ .deps/* .libs/*
    210222 
    211 --- kdegraphics-3.5.0/kiconedit/main.cpp        2005-10-10 10:56:55.000000000 -0400
    212 +++ kdegraphics-3.5.0-new/kiconedit/main.cpp    2005-11-22 13:52:47.000000000 -0500
     223--- kdegraphics-3.5.4/kiconedit/main.cpp        2005-10-10 10:56:55.000000000 -0400
     224+++ kdegraphics-3.5.4-new/kiconedit/main.cpp    2006-07-31 01:03:32.000000000 -0400
    213225@@ -40,7 +40,7 @@
    214226   KCmdLineLastOption
    215227 };
    … …  
    219231 {
    220232   KAboutData aboutData( "kiconedit", I18N_NOOP("KIconEdit"),
    221233     VERSION, description, KAboutData::License_GPL,
    222 --- kdegraphics-3.5.0/kooka/Makefile.am 2005-09-10 04:19:00.000000000 -0400
    223 +++ kdegraphics-3.5.0-new/kooka/Makefile.am     2005-11-22 13:52:47.000000000 -0500
     234--- kdegraphics-3.5.4/kooka/Makefile.am 2005-09-10 04:19:00.000000000 -0400
     235+++ kdegraphics-3.5.4-new/kooka/Makefile.am     2006-07-31 01:03:32.000000000 -0400
    224236@@ -2,10 +2,13 @@
    225237 
    226238 SUBDIRS = pics
    … …  
    248260 
    249261 INCLUDES         = -I$(top_srcdir)/libkscan $(all_includes) $(LIBSANE_INCLUDES) $(KADMOS_INC)
    250262 
    251 --- kdegraphics-3.5.0/kooka/main.cpp    2005-09-10 04:19:00.000000000 -0400
    252 +++ kdegraphics-3.5.0-new/kooka/main.cpp        2005-11-22 13:52:47.000000000 -0500
     263--- kdegraphics-3.5.4/kooka/main.cpp    2005-09-10 04:19:00.000000000 -0400
     264+++ kdegraphics-3.5.4-new/kooka/main.cpp        2006-07-31 01:03:32.000000000 -0400
    253265@@ -71,7 +71,7 @@
    254266 
    255267 
    … …  
    259271 {
    260272    KAboutData about("kooka", I18N_NOOP("Kooka"), KOOKA_VERSION, I18N_NOOP(description),
    261273                    KAboutData::License_GPL_V2, "(C) 2000 Klaas Freitag", 0,
    262 --- kdegraphics-3.5.0/kpdf/Makefile.am  2005-09-10 04:18:43.000000000 -0400
    263 +++ kdegraphics-3.5.0-new/kpdf/Makefile.am      2005-11-22 13:52:47.000000000 -0500
     274--- kdegraphics-3.5.4/kpdf/Makefile.am  2005-09-10 04:18:43.000000000 -0400
     275+++ kdegraphics-3.5.4-new/kpdf/Makefile.am      2006-07-31 01:03:32.000000000 -0400
    264276@@ -1,6 +1,6 @@
    265277 SUBDIRS = xpdf conf core ui shell
    266278 
    … …  
    269281 
    270282 METASOURCES = AUTO
    271283 
    272 --- kdegraphics-3.5.0/kpdf/shell/Makefile.am    2005-09-10 04:18:43.000000000 -0400
    273 +++ kdegraphics-3.5.0-new/kpdf/shell/Makefile.am        2005-11-22 13:52:47.000000000 -0500
     284--- kdegraphics-3.5.4/kpdf/shell/Makefile.am    2005-09-10 04:18:43.000000000 -0400
     285+++ kdegraphics-3.5.4-new/kpdf/shell/Makefile.am        2006-07-31 01:03:32.000000000 -0400
    274286@@ -1,12 +1,15 @@
    275287-INCLUDES = -I$(srcdir)/xpdf -I$(srcdir)/xpdf/goo -I$(top_builddir)/kpdf $(all_includes) $(FREETYPE_CFLAGS)
    276288+INCLUDES = -I$(srcdir)/xpdf -I$(srcdir)/xpdf/goo -I$(top_builddir)/kpdf $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) $(all_includes)
    … …  
    292304 
    293305 EXTRA_DIST = kpdf.desktop
    294306 xdg_apps_DATA = kpdf.desktop
    295 --- kdegraphics-3.5.0/kpdf/shell/main.cpp       2005-09-10 04:18:43.000000000 -0400
    296 +++ kdegraphics-3.5.0-new/kpdf/shell/main.cpp   2005-11-22 13:52:47.000000000 -0500
     307--- kdegraphics-3.5.4/kpdf/shell/main.cpp       2006-07-23 10:15:17.000000000 -0400
     308+++ kdegraphics-3.5.4-new/kpdf/shell/main.cpp   2006-07-31 01:03:32.000000000 -0400
    297309@@ -29,7 +29,7 @@
    298310     KCmdLineLastOption
    299311 };
    … …  
    303315 {
    304316     KAboutData about(
    305317         "kpdf",
    306 --- kdegraphics-3.5.0/kpdf/xpdf/xpdf/Makefile.am        2005-09-10 04:18:43.000000000 -0400
    307 +++ kdegraphics-3.5.0-new/kpdf/xpdf/xpdf/Makefile.am    2005-11-22 13:52:47.000000000 -0500
     318--- kdegraphics-3.5.4/kpdf/xpdf/xpdf/GlobalParams.cc    2005-11-08 17:25:47.000000000 -0500
     319+++ kdegraphics-3.5.4-new/kpdf/xpdf/xpdf/GlobalParams.cc        2006-07-31 01:03:32.000000000 -0400
     320@@ -1315,7 +1315,7 @@
     321   if (type.contains("Italic")) slant=FC_SLANT_ITALIC;
     322   if (type.contains("Bold")) weight=FC_WEIGHT_BOLD;
     323   if (type.contains("Light")) weight=FC_WEIGHT_LIGHT;
     324-  if (type.contains("Condensed")) width=FC_WIDTH_CONDENSED;
     325+  // if (type.contains("Condensed")) width=FC_WIDTH_CONDENSED;
     326 }
     327 
     328 DisplayFontParam *GlobalParams::getDisplayFont(GString *fontName) {
     329@@ -1329,13 +1329,14 @@
     330   dfp = (DisplayFontParam *)displayFonts->lookup(fontName);
     331   // KPDF: try to find font using Xft
     332   if (!dfp) {
     333-       int weight=FC_WEIGHT_MEDIUM, slant=FC_SLANT_ROMAN, width=FC_WIDTH_NORMAL;
     334+       int weight=FC_WEIGHT_MEDIUM, slant=FC_SLANT_ROMAN, width=0;
     335        QString name(fontName->getCString());
     336       
     337        parseStyle(name,weight,slant,width);
     338        p = FcPatternBuild(0,FC_FAMILY,FcTypeString, name.ascii(),
     339                FC_SLANT, FcTypeInteger, slant, FC_WEIGHT, FcTypeInteger, weight,
     340-               FC_WIDTH, FcTypeInteger, width, FC_LANG, FcTypeString, "xx", (char*)0);
     341+               // FC_WIDTH, FcTypeInteger, width, FC_LANG, FcTypeString, "xx", (char*)0);
     342+               FC_LANG, FcTypeString, "xx", (char*)0);
     343        if (!p) goto fin;
     344        m = XftFontMatch(qt_xdisplay(),qt_xscreen(),p,&res);
     345        if (!m) goto fin;
     346--- kdegraphics-3.5.4/kpdf/xpdf/xpdf/Makefile.am        2006-05-22 14:05:33.000000000 -0400
     347+++ kdegraphics-3.5.4-new/kpdf/xpdf/xpdf/Makefile.am    2006-07-31 01:03:32.000000000 -0400
    308348@@ -1,7 +1,7 @@
    309 -INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../splash -I$(srcdir)/../goo $(all_includes) $(LIBFREETYPE_CFLAGS) $(XFT_CFLAGS) $(X_INCLUDES) $(QT_INCLUDES)
    310 +INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../splash -I$(srcdir)/../goo $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) $(all_includes) $(XFT_CFLAGS) $(X_INCLUDES) $(QT_INCLUDES)
     349 INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../splash -I$(srcdir)/../goo $(LIBFREETYPE_CFLAGS) $(XFT_CFLAGS) $(all_includes)
    311350 
    312351 libxpdf_la_LDFLAGS = $(all_libraries)
    313352-libxpdf_la_LIBADD = $(LIB_X11) $(LIBFREETYPE_LIBS) $(LIBPAPER_LIBS) $(XFT_LIBS) $(LIBJPEG) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la
    314 +libxpdf_la_LIBADD = $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIB_X11) $(LIBPAPER_LIBS) $(XFT_LIBS) $(LIBJPEG) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la
     353+libxpdf_la_LIBADD = $(LIBFREETYPE_LIBS) $(XFT_LIBS) $(LIB_X11) $(LIBPAPER_LIBS) $(LIBJPEG) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la
    315354 libxpdf_la_SOURCES = Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc \
    316355      Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc DCTStream.cc \
    317356      FontEncodingTables.cc Function.cc Gfx.cc \
    318 --- kdegraphics-3.5.0/kpovmodeler/Makefile.am   2005-09-10 04:18:54.000000000 -0400
    319 +++ kdegraphics-3.5.0-new/kpovmodeler/Makefile.am       2005-11-22 13:52:47.000000000 -0500
     357--- kdegraphics-3.5.4/kpovmodeler/Makefile.am   2005-09-10 04:18:54.000000000 -0400
     358+++ kdegraphics-3.5.4-new/kpovmodeler/Makefile.am       2006-07-31 01:03:32.000000000 -0400
    320359@@ -224,11 +224,12 @@
    321360 ####
    322361 # the executable
    … …  
    334373 
    335374 dummy.cpp:
    336375        echo > dummy.cpp
    337 --- kdegraphics-3.5.0/kpovmodeler/main.cpp      2005-09-10 04:18:54.000000000 -0400
    338 +++ kdegraphics-3.5.0-new/kpovmodeler/main.cpp  2005-11-22 13:52:48.000000000 -0500
     376--- kdegraphics-3.5.4/kpovmodeler/main.cpp      2005-09-10 04:18:54.000000000 -0400
     377+++ kdegraphics-3.5.4-new/kpovmodeler/main.cpp  2006-07-31 01:03:32.000000000 -0400
    339378@@ -35,7 +35,7 @@
    340379   KCmdLineLastOption
    341380 };
    … …  
    345384 {
    346385    PMShell* shell = 0;
    347386 
    348 --- kdegraphics-3.5.0/kruler/Makefile.am        2005-09-10 04:19:23.000000000 -0400
    349 +++ kdegraphics-3.5.0-new/kruler/Makefile.am    2005-11-22 13:52:48.000000000 -0500
     387--- kdegraphics-3.5.4/kruler/Makefile.am        2005-09-10 04:19:23.000000000 -0400
     388+++ kdegraphics-3.5.4-new/kruler/Makefile.am    2006-07-31 01:03:32.000000000 -0400
    350389@@ -2,11 +2,14 @@
    351390 
    352391 INCLUDES= $(all_includes)
    … …  
    367406 
    368407 xdg_apps_DATA = kruler.desktop
    369408 
    370 --- kdegraphics-3.5.0/kruler/main.cpp   2005-09-10 04:19:23.000000000 -0400
    371 +++ kdegraphics-3.5.0-new/kruler/main.cpp       2005-11-22 13:52:48.000000000 -0500
     409--- kdegraphics-3.5.4/kruler/main.cpp   2005-09-10 04:19:23.000000000 -0400
     410+++ kdegraphics-3.5.4-new/kruler/main.cpp       2006-07-31 01:03:32.000000000 -0400
    372411@@ -22,7 +22,7 @@
    373412   // INSERT YOUR COMMANDLINE OPTIONS HERE
    374413 };
    … …  
    378417 {
    379418 
    380419 
    381 --- kdegraphics-3.5.0/ksnapshot/Makefile.am     2005-09-10 04:19:19.000000000 -0400
    382 +++ kdegraphics-3.5.0-new/ksnapshot/Makefile.am 2005-11-22 13:53:31.000000000 -0500
     420--- kdegraphics-3.5.4/ksnapshot/Makefile.am     2005-09-10 04:19:19.000000000 -0400
     421+++ kdegraphics-3.5.4-new/ksnapshot/Makefile.am 2006-07-31 01:03:32.000000000 -0400
    383422@@ -1,14 +1,16 @@
    384423-bin_PROGRAMS= ksnapshot
    385424+bin_PROGRAMS=
    … …  
    402441 
    403442 xdg_apps_DATA = ksnapshot.desktop
    404443 
    405 --- kdegraphics-3.5.0/ksnapshot/main.cpp        2005-10-10 10:56:53.000000000 -0400
    406 +++ kdegraphics-3.5.0-new/ksnapshot/main.cpp    2005-11-22 13:52:48.000000000 -0500
     444--- kdegraphics-3.5.4/ksnapshot/main.cpp        2005-10-10 10:56:53.000000000 -0400
     445+++ kdegraphics-3.5.4-new/ksnapshot/main.cpp    2006-07-31 01:03:32.000000000 -0400
    407446@@ -40,7 +40,7 @@
    408447     { 0, 0, 0 }
    409448 };
    … …  
    413452 {
    414453   KAboutData aboutData( "ksnapshot", I18N_NOOP("KSnapshot"),
    415454     KSNAPVERSION, description, KAboutData::License_GPL,
    416 --- kdegraphics-3.5.0/ksvg/Makefile.am  2005-09-10 04:19:19.000000000 -0400
    417 +++ kdegraphics-3.5.0-new/ksvg/Makefile.am      2005-11-22 13:52:48.000000000 -0500
     455--- kdegraphics-3.5.4/ksvg/Makefile.am  2005-09-10 04:19:19.000000000 -0400
     456+++ kdegraphics-3.5.4-new/ksvg/Makefile.am      2006-07-31 01:03:32.000000000 -0400
    418457@@ -4,9 +4,9 @@
    419458 libksvg_la_SOURCES = dummy.cc
    420459 libksvg_la_METASOURCES = AUTO
    … …  
    427466 
    428467 INCLUDES = -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl $(all_includes)
    429468 
    430 --- kdegraphics-3.5.0/ksvg/impl/libs/libtext2path/src/Makefile.am       2005-09-10 04:19:14.000000000 -0400
    431 +++ kdegraphics-3.5.0-new/ksvg/impl/libs/libtext2path/src/Makefile.am   2005-11-22 13:52:48.000000000 -0500
     469--- kdegraphics-3.5.4/ksvg/impl/libs/libtext2path/src/Makefile.am       2005-09-10 04:19:14.000000000 -0400
     470+++ kdegraphics-3.5.4-new/ksvg/impl/libs/libtext2path/src/Makefile.am   2006-07-31 01:03:32.000000000 -0400
    432471@@ -1,10 +1,10 @@
    433472 lib_LTLIBRARIES = libtext2path.la
    434473 
    … …  
    442481 libtext2path_la_SOURCES = Affine.cpp Rectangle.cpp Font.cpp Glyph.cpp GlyphTracer.cpp Converter.cpp QtUnicode.cpp
    443482-libtext2path_la_LDFLAGS = $(FRIBIDI_LIBS) $(FONTCONFIG_LIBS)
    444483+libtext2path_la_LDFLAGS = $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(FRIBIDI_LIBS)
    445 --- kdegraphics-3.5.0/ksvg/plugin/backends/agg/Makefile.am      2005-09-10 04:19:12.000000000 -0400
    446 +++ kdegraphics-3.5.0-new/ksvg/plugin/backends/agg/Makefile.am  2005-11-22 13:52:48.000000000 -0500
     484--- kdegraphics-3.5.4/ksvg/plugin/backends/agg/Makefile.am      2005-09-10 04:19:12.000000000 -0400
     485+++ kdegraphics-3.5.4-new/ksvg/plugin/backends/agg/Makefile.am  2006-07-31 01:03:33.000000000 -0400
    447486@@ -12,4 +12,4 @@
    448487 kde_services_DATA = ksvgaggcanvas.desktop
    449488 
    450489 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
    451490-INCLUDES = $(KDE_INCLUDES) $(AGG_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/impl/libs/art_support -I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
    452491+INCLUDES = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) $(KDE_INCLUDES) $(AGG_CFLAGS) -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/impl/libs/art_support -I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
    453 --- kdegraphics-3.5.0/ksvg/plugin/backends/libart/Makefile.am   2005-09-10 04:19:11.000000000 -0400
    454 +++ kdegraphics-3.5.0-new/ksvg/plugin/backends/libart/Makefile.am       2005-11-22 13:52:48.000000000 -0500
     492--- kdegraphics-3.5.4/ksvg/plugin/backends/libart/Makefile.am   2005-09-10 04:19:11.000000000 -0400
     493+++ kdegraphics-3.5.4-new/ksvg/plugin/backends/libart/Makefile.am       2006-07-31 01:03:33.000000000 -0400
    455494@@ -8,4 +8,4 @@
    456495 kde_services_DATA = ksvglibartcanvas.desktop
    457496 
    458497 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
    459498-INCLUDES = $(LIBART_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/impl/libs/art_support -I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(KDE_INCLUDES) $(all_includes)
    460499+INCLUDES = $(FREETYPE_CFLAGS) $(LIBART_CFLAGS) $(FONTCONFIG_CFLAGS) -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/impl/libs/art_support -I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(KDE_INCLUDES) $(all_includes)
    461 --- kdegraphics-3.5.0/ksvg/test/external/Makefile.am    2005-09-10 04:19:09.000000000 -0400
    462 +++ kdegraphics-3.5.0-new/ksvg/test/external/Makefile.am        2005-11-22 13:52:48.000000000 -0500
     500--- kdegraphics-3.5.4/ksvg/test/external/Makefile.am    2005-09-10 04:19:09.000000000 -0400
     501+++ kdegraphics-3.5.4-new/ksvg/test/external/Makefile.am        2006-07-31 01:03:33.000000000 -0400
    463502@@ -1,13 +1,16 @@
    464503 INCLUDES = $(FREETYPE_CFLAGS) -I$(top_srcdir)/ksvg -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
    465504+LDFLAGS = $(FREETYPE_LDFLAGS)
    … …  
    484523+printnodetest_la_SOURCES = printnodetest.cpp
    485524+printnodetest_la_LIBADD =  $(LIB_KDECORE) ../../libksvg.la
    486525+printnodetest_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -module
    487 --- kdegraphics-3.5.0/ksvg/test/external/printnodetest.cpp      2005-10-10 10:56:46.000000000 -0400
    488 +++ kdegraphics-3.5.0-new/ksvg/test/external/printnodetest.cpp  2005-11-22 13:52:48.000000000 -0500
     526--- kdegraphics-3.5.4/ksvg/test/external/printnodetest.cpp      2005-10-10 10:56:46.000000000 -0400
     527+++ kdegraphics-3.5.4-new/ksvg/test/external/printnodetest.cpp  2006-07-31 01:03:33.000000000 -0400
    489528@@ -44,7 +44,7 @@
    490529        exit(0);
    491530 }
    … …  
    495534 {
    496535        KAboutData *about = new KAboutData("KSVG printNode test app", I18N_NOOP("KSVG test"), "0.1", I18N_NOOP("KSVG printNode test app"));
    497536        KCmdLineArgs::init(argc, argv, about);
    498 --- kdegraphics-3.5.0/ksvg/test/external/svgdisplay.cc  2005-09-10 04:19:09.000000000 -0400
    499 +++ kdegraphics-3.5.0-new/ksvg/test/external/svgdisplay.cc      2005-11-22 13:52:48.000000000 -0500
     537--- kdegraphics-3.5.4/ksvg/test/external/svgdisplay.cc  2005-09-10 04:19:09.000000000 -0400
     538+++ kdegraphics-3.5.4-new/ksvg/test/external/svgdisplay.cc      2006-07-31 01:03:33.000000000 -0400
    500539@@ -10,7 +10,7 @@
    501540        KCmdLineLastOption
    502541 };
    … …  
    506545 {
    507546 
    508547        KAboutData *about = new KAboutData( "KSVG test app", I18N_NOOP("KSVG test"), "0.1", I18N_NOOP("KSVG standalone test app") );
    509 --- kdegraphics-3.5.0/kviewshell/Makefile.am    2005-09-10 04:19:21.000000000 -0400
    510 +++ kdegraphics-3.5.0-new/kviewshell/Makefile.am        2005-11-22 13:52:48.000000000 -0500
     548--- kdegraphics-3.5.4/kviewshell/Makefile.am    2005-09-10 04:19:21.000000000 -0400
     549+++ kdegraphics-3.5.4-new/kviewshell/Makefile.am        2006-07-31 01:03:33.000000000 -0400
    511550@@ -5,8 +5,9 @@
    512551 
    513552 ####### Files
    … …  
    532571 
    533572 kviewshellinclude_HEADERS = anchor.h bookmark.h pageView.h documentPageCache.h documentRenderer.h documentWidget.h \
    534573        history.h hyperlink.h kmultipage.h length.h pageNumber.h pageSize.h renderedDocumentPage.h renderedDocumentPagePixmap.h \
    535 --- kdegraphics-3.5.0/kviewshell/main.cpp       2005-11-08 17:25:45.000000000 -0500
    536 +++ kdegraphics-3.5.0-new/kviewshell/main.cpp   2005-11-22 13:52:48.000000000 -0500
     574--- kdegraphics-3.5.4/kviewshell/main.cpp       2005-11-08 17:25:45.000000000 -0500
     575+++ kdegraphics-3.5.4-new/kviewshell/main.cpp   2006-07-31 01:03:33.000000000 -0400
    537576@@ -32,7 +32,7 @@
    538577 static const char description[] = I18N_NOOP("Generic framework for viewer applications");
    539578 
    … …  
    543582 {
    544583   KAboutData about ("kviewshell", I18N_NOOP("KViewShell"), "0.6",
    545584                    description, KAboutData::License_GPL,
    546 --- kdegraphics-3.5.0/libkscan/img_canvas.cpp   2005-10-10 10:56:40.000000000 -0400
    547 +++ kdegraphics-3.5.0-new/libkscan/img_canvas.cpp       2005-11-22 13:52:48.000000000 -0500
    548 @@ -700,7 +700,7 @@
     585--- kdegraphics-3.5.4/kviewshell/plugins/djvu/libdjvu/Makefile.am       2005-11-08 17:25:45.000000000 -0500
     586+++ kdegraphics-3.5.4-new/kviewshell/plugins/djvu/libdjvu/Makefile.am   2006-07-31 01:03:33.000000000 -0400
     587@@ -1,7 +1,7 @@
     588 INCLUDES = -I$(top_srcdir) $(all_includes)
     589 
     590-kde_module_LTLIBRARIES = libdjvu.la
     591-libdjvu_la_LDFLAGS = -avoid-version $(all_libraries)
     592+lib_LTLIBRARIES = libdjvu.la
     593+libdjvu_la_LDFLAGS = $(all_libraries)
     594 libdjvu_la_LIBADD = $(LIBJPEG)
     595 libdjvu_la_SOURCES = Arrays.cpp DjVuDocEditor.cpp DjVuMessageLite.cpp GOS.cpp IW44Image.cpp \
     596        BSByteStream.cpp DjVuDocument.cpp DjVuNavDir.cpp GPixmap.cpp JB2EncodeCodec.cpp \
     597--- kdegraphics-3.5.4/libkscan/img_canvas.cpp   2006-05-22 14:05:37.000000000 -0400
     598+++ kdegraphics-3.5.4-new/libkscan/img_canvas.cpp       2006-07-31 01:03:33.000000000 -0400
     599@@ -701,7 +701,7 @@
    549600                            double(image->width());
    550601             kdDebug(29000) << "FIT WIDTH scrollbar to substract: " << sbWidth << endl;
    551602         }
    … …  
    554605         break;
    555606     case FIT_HEIGHT:
    556607         used_yscaler = used_xscaler = double(noSBSize.height())/double(image->height());
    557 @@ -715,12 +715,12 @@
     608@@ -716,12 +716,12 @@
    558609             kdDebug(29000) << "FIT HEIGHT scrollbar to substract: " << sbWidth << endl;
    559610             // scale = int(100.0*(noSBSize.height() -sbWidth) / image->height());
    560611         }
    … …  
    569620         break;
    570621     default:
    571622         break;
    572 --- kdegraphics-3.5.0/kviewshell/plugins/djvu/libdjvu/Makefile.am       2005-11-08 17:25:45.000000000 -0500
    573 +++ kdegraphics-3.5.0-new/kviewshell/plugins/djvu/libdjvu/Makefile.am   2005-11-26 10:47:53.000000000 -0500
    574 @@ -1,7 +1,7 @@
    575  INCLUDES = -I$(top_srcdir) $(all_includes)
    576  
    577 -kde_module_LTLIBRARIES = libdjvu.la
    578 -libdjvu_la_LDFLAGS = -avoid-version $(all_libraries)
    579 +lib_LTLIBRARIES = libdjvu.la
    580 +libdjvu_la_LDFLAGS = $(all_libraries)
    581  libdjvu_la_LIBADD = $(LIBJPEG)
    582  libdjvu_la_SOURCES = Arrays.cpp DjVuDocEditor.cpp DjVuMessageLite.cpp GOS.cpp IW44Image.cpp \
    583         BSByteStream.cpp DjVuDocument.cpp DjVuNavDir.cpp GPixmap.cpp JB2EncodeCodec.cpp \
    584 --- kdegraphics-3.5.0/kfaxview/libkfaximage/Makefile.am 2005-09-10 04:18:44.000000000 -0400
    585 +++ kdegraphics-3.5.0-new/kfaxview/libkfaximage/Makefile.am     2005-11-27 10:55:12.000000000 -0500
    586 @@ -1,7 +1,7 @@
    587  INCLUDES = -I$(top_srcdir) $(all_includes)
    588  
    589  lib_LTLIBRARIES = libkfaximage.la
    590 -libkfaximage_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
    591 +libkfaximage_la_LDFLAGS = $(all_libraries) -no-undefined
    592  libkfaximage_la_LIBADD  = $(LIB_KDECORE)
    593  libkfaximage_la_SOURCES = kfaximage.cpp faxexpand.cpp faxinit.cpp
    594  
    595 --- kdegraphics-3.5.0/kpdf/xpdf/xpdf/GlobalParams.cc    Tue Nov  8 17:25:47 2005
    596 +++ kdegraphics-3.5.0-new/kpdf/xpdf/xpdf/GlobalParams.cc        Sat Jan 14 16:23:46 2006
    597 @@ -1315,7 +1315,7 @@
    598    if (type.contains("Italic")) slant=FC_SLANT_ITALIC;
    599    if (type.contains("Bold")) weight=FC_WEIGHT_BOLD;
    600    if (type.contains("Light")) weight=FC_WEIGHT_LIGHT;
    601 -  if (type.contains("Condensed")) width=FC_WIDTH_CONDENSED;
    602 +  // if (type.contains("Condensed")) width=FC_WIDTH_CONDENSED;
    603  }
    604  
    605  DisplayFontParam *GlobalParams::getDisplayFont(GString *fontName) {
    606 @@ -1329,13 +1329,14 @@
    607    dfp = (DisplayFontParam *)displayFonts->lookup(fontName);
    608    // KPDF: try to find font using Xft
    609    if (!dfp) {
    610 -       int weight=FC_WEIGHT_MEDIUM, slant=FC_SLANT_ROMAN, width=FC_WIDTH_NORMAL;
    611 +       int weight=FC_WEIGHT_MEDIUM, slant=FC_SLANT_ROMAN, width=0;
    612         QString name(fontName->getCString());
    613        
    614         parseStyle(name,weight,slant,width);
    615         p = FcPatternBuild(0,FC_FAMILY,FcTypeString, name.ascii(),
    616                 FC_SLANT, FcTypeInteger, slant, FC_WEIGHT, FcTypeInteger, weight,
    617 -               FC_WIDTH, FcTypeInteger, width, FC_LANG, FcTypeString, "xx", (char*)0);
    618 +               // FC_WIDTH, FcTypeInteger, width, FC_LANG, FcTypeString, "xx", (char*)0);
    619 +               FC_LANG, FcTypeString, "xx", (char*)0);
    620         if (!p) goto fin;
    621         m = XftFontMatch(qt_xdisplay(),qt_xscreen(),p,&res);
    622         if (!m) goto fin;
    623 --- kdegraphics-3.5.1/kpdf/part.cpp     2006-01-19 11:38:22.000000000 -0500
    624 +++ kdegraphics-3.5.1-new/kpdf/part.cpp 2006-01-24 16:57:42.000000000 -0500
    625 @@ -697,6 +697,11 @@
    626      KURL saveURL = KFileDialog::getSaveURL( url().isLocalFile() ? url().url() : url().fileName(), QString::null, widget() );
    627      if ( saveURL.isValid() && !saveURL.isEmpty() )
    628      {
    629 +        if (saveURL == url())
    630 +        {
    631 +                KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").arg(saveURL.filename()) );
    632 +                    return;
    633 +        }
    634          if ( KIO::NetAccess::exists( saveURL, false, widget() ) )
    635          {
    636              if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(saveURL.filename()), QString::null, i18n("Overwrite")) != KMessageBox::Continue)
    637 --- kdegraphics-3.5.1/kpdf/xpdf/splash/SplashXPathScanner.cc    (Revision 505052)
    638 +++ kdegraphics-3.5.1-new/kpdf/xpdf/splash/SplashXPathScanner.cc        (Arbeitskopie)
    639 @@ -186,7 +186,7 @@ GBool SplashXPathScanner::getNextSpan(in
    640  }
    641  
    642  void SplashXPathScanner::computeIntersections(int y) {
    643 -  SplashCoord ySegMin, ySegMax, xx0, xx1;
    644 +  SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1;
    645    SplashXPathSeg *seg;
    646    int i, j;
    647  
    648 @@ -236,19 +236,27 @@ void SplashXPathScanner::computeIntersec
    649      } else if (seg->flags & splashXPathVert) {
    650        xx0 = xx1 = seg->x0;
    651      } else {
    652 -      if (ySegMin <= y) {
    653 -       // intersection with top edge
    654 -       xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
    655 +      if (seg->x0 < seg->x1) {
    656 +       xSegMin = seg->x0;
    657 +       xSegMax = seg->x1;
    658        } else {
    659 -       // x coord of segment endpoint with min y coord
    660 -       xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0;
    661 +       xSegMin = seg->x1;
    662 +       xSegMax = seg->x0;
    663        }
    664 -      if (ySegMax >= y + 1) {
    665 -       // intersection with bottom edge
    666 -       xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
    667 -      } else {
    668 -       // x coord of segment endpoint with max y coord
    669 -       xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1;
    670 +      // intersection with top edge
    671 +      xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
    672 +      // intersection with bottom edge
    673 +      xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
    674 +      // the segment may not actually extend to the top and/or bottom edges
    675 +      if (xx0 < xSegMin) {
    676 +       xx0 = xSegMin;
    677 +      } else if (xx0 > xSegMax) {
    678 +       xx0 = xSegMax;
    679 +      }
    680 +      if (xx1 < xSegMin) {
    681 +       xx1 = xSegMin;
    682 +      } else if (xx1 > xSegMax) {
    683 +       xx1 = xSegMax;
    684        }
    685      }
    686      if (xx0 < xx1) {

  • kdegraphics3/files/CompileScript.sh

     
    11#!/bin/sh -e
    22
    3         export HOME=/tmp
    4         export PREFIX="%p"
     3        export PREFIX="%p" USE_UNSERMAKE=1
    54        . ./environment-helper.sh
    6         export lt_cv_sys_max_cmd_len=65536
    75
    8 #unsermake
    9         export UNSERMAKE="no"
    10 
    11         export CC=gcc CXX=g++
    12 
    136        ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
    147        ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
    15         ./build-helper.sh make      %N %v %r make all all_libraries="$ALL_LIBRARIES"
     8        ./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS

  • kdegraphics3/Portfile

     
    11# $Id$
    22
    3 #Synced with Fink, Version 3.5.1-1023
     3#Synced with Fink, Version 3.5.4-1021
    44
    55PortSystem 1.0
    66name            kdegraphics3
    7 version         3.5.1
    8 revision        1
    9 set kdeadmin    kde-admindir-3.5.1
     7version         3.5.4
     8set kdeadmin    kde-admindir-252
    109categories      kde
    1110maintainers     ben@macports.org takanori@macports.org
    1211description     KDE graphics. \
    1312                NB No KDE sound support.
    1413platforms       darwin
    15 master_sites    opendarwin::kde351 \
     14master_sites    opendarwin::kde354 \
    1615                opendarwin::admin
    1716#               kde:stable/${version}/src
    1817#               http://ranger.befunk.com/fink/:admin
    19 extract.suffix  .tar.bz2
    2018use_bzip2       yes
    2119distname        kdegraphics-${version}
    22 distfiles       ${distname}.tar.bz2:kde351 \
     20distfiles       ${distname}.tar.bz2:kde354 \
    2321                ${kdeadmin}.tar.bz2:admin
    2422depends_build   port:autoconf \
    25                 port:automake
    26 depends_lib     port:kdebase3 \
    27                 port:sane-backends \
    28                 port:fribidi \
    29                 port:lcms \
     23                port:unsermake
     24depends_lib     port:fribidi \
    3025                port:imlib \
    31                 port:xpdf \
    32                 port:libusb
    33 #poppler-qt3
     26                port:kdebase3 \
     27                port:lcms \
     28                port:libusb \
     29                port:sane-backends \
     30                port:xpdf
     31#               bin:tex:teTeX
     32#               port:libwww
     33#               port:poppler-qt3
    3434
    35 checksums       ${distname}.tar.bz2 md5 2cd1c5348b7df46cf7f9d91e1dbfebd2 \
    36                 ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
    3735
    38 extract.only ${distname}.tar.bz2
    39 post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
     36checksums       ${distname}.tar.bz2 md5 de1f6d0597235f52186aaeeaabe7dc08 \
     37                ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
    4038
     39extract.only    ${distname}.tar.bz2
     40post-extract    { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
     41
    4142patchfiles      kdegraphics3.patch dp01.patch
    4243patch           {
    4344                cd ${worksrcpath}
    4445                foreach file $patchfiles {
    45                     system "sed -e 's,@FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
     46                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
    4647                }
     48                system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' admin/*"
    4749}
    48 post-patch      {
    49                 reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
    50                 reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
     50post-patch      {
     51                reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
    5152                reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
    52                 reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
    53                 foreach file [glob ${worksrcpath}/admin/*] {
    54                     reinplace "s|-O2|-Os|g" $file
    55                     reinplace "s|doc/HTML|doc/kde|g" $file
    56                     reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
    57                 }
    5853                foreach file {CompileScript.sh InstallScript.sh} {
    59                     file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
     54                    file copy ${filespath}/${file} ${worksrcpath}
    6055                    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
    6156                    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
    6257                    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
    … …  
    6863                }
    6964}
    7065
    71 configure.args  --without-kamera --with-imlib-config=${prefix}/bin --with-distribution='DarwinPorts/Mac OS X' --without-arts
     66configure.args  --without-kamera --with-imlib-config=${prefix}/bin --with-distribution='MacPorts/Mac OS X' --without-arts
    7267
    7368configure       {}
    7469build           { system "cd ${worksrcpath} && ./CompileScript.sh" }
    7570destroot        { system "cd ${worksrcpath} && ./InstallScript.sh" }
    7671
    77 post-destroot   {
     72post-destroot   {
    7873                xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
    7974                xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING ChangeLog INSTALL README ${destroot}${prefix}/share/doc/${name}
    8075}
    81 
    82 platform darwin 6 {
    83         depends_lib-append      lib:libdl:dlcompat
    84 }

  • kdelibs3/files/kdelibs3-unified.patch

     
    1 --- kdelibs-3.5.0/darwin/kcmartsrc      1969-12-31 19:00:00.000000000 -0500
    2 +++ kdelibs-3.5.0-new/darwin/kcmartsrc  2005-11-13 08:18:01.000000000 -0500
    3 @@ -0,0 +1,14 @@
     1
     2--- kdelibs-3.5.4/darwin/kcmartsrc      1969-12-31 16:00:00.000000000 -0800
     3+++ kdelibs-3.5.4-new/darwin/kcmartsrc  2006-07-27 10:33:34.000000000 -0700
     4@@ -0,0 +1,9 @@
    45+[Arts]
    5 +AddOptions=
    6 +Arguments=\s-F 10 -S 4096 -a esd -s 60 -m artsmessage -c drkonqi -l 3 -f
     6+Arguments=\s-F 10 -S 4096 -a esd -d -b 16 -s 60 -m artsmessage -c drkonqi -l 3 -f
     7+Bits=16
     8+FullDuplex=true
    79+AudioIO=esd
    8 +AutoSuspend=true
    9 +Bits=0
    10 +DeviceName=
    11 +FullDuplex=false
    12 +Latency=250
    13 +NetworkTransparent=false
    14 +SamplingRate=0
     10+NetworkTransparent=true
    1511+StartRealtime=false
    16 +StartServer=true
     12+StartServer=false
    1713+SuspendTime=60
    18 --- kdelibs-3.5.0/darwin/kdeglobals     1969-12-31 19:00:00.000000000 -0500
    19 +++ kdelibs-3.5.0-new/darwin/kdeglobals 2005-11-13 08:18:01.000000000 -0500
     14--- kdelibs-3.5.4/darwin/kdeglobals     1969-12-31 16:00:00.000000000 -0800
     15+++ kdelibs-3.5.4-new/darwin/kdeglobals 2006-07-27 10:33:34.000000000 -0700
    2016@@ -0,0 +1,129 @@
    2117+[$Version]
    2218+update_info=kaccel.upd:kde3.3/r1,kded.upd:kde3.0,klippershortcuts.upd:04112002,kwin.upd:kde3.2Xinerama,socks.upd:kde3.0/r1
    … …  
    147143+
    148144+[WM]
    149145+activeFont=Baghdad,12,-1,5,50,0,0,0,0,0
    150 --- kdelibs-3.5.0/darwin/konsolerc      1969-12-31 19:00:00.000000000 -0500
    151 +++ kdelibs-3.5.0-new/darwin/konsolerc  2005-11-13 08:18:01.000000000 -0500
     146--- kdelibs-3.5.4/darwin/knotifyrc      1969-12-31 16:00:00.000000000 -0800
     147+++ kdelibs-3.5.4-new/darwin/knotifyrc  2006-07-27 10:33:34.000000000 -0700
     148@@ -0,0 +1,5 @@
     149+[Misc]
     150+External player=@FINKPREFIX@/bin/mplayer
     151+LastConfiguredApp=knotify
     152+Use external player=false
     153+Volume=100
     154--- kdelibs-3.5.4/darwin/konsolerc      1969-12-31 16:00:00.000000000 -0800
     155+++ kdelibs-3.5.4-new/darwin/konsolerc  2006-07-27 10:33:34.000000000 -0700
    152156@@ -0,0 +1,19 @@
    153157+[Desktop Entry]
    154158+ActiveSession=0
    … …  
    169173+schema=Linux.schema
    170174+scrollbar=2
    171175+tabbar=2
    172 --- kdelibs-3.5.0/kabc/Makefile.am      2005-09-10 04:27:01.000000000 -0400
    173 +++ kdelibs-3.5.0-new/kabc/Makefile.am  2005-11-13 08:18:01.000000000 -0500
    174 @@ -2,7 +2,7 @@
    175  
    176  # Make sure $(all_includes) remains last!
    177  INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc -I$(top_srcdir)/kab \
    178 -           -I$(srcdir)/vcardparser/ -I$(srcdir)/vcard/include \
    179 +           -I$(srcdir)/vcard/include -I$(srcdir)/vcardparser/ \
    180             -I$(srcdir)/vcard/include/generated \
    181             -I$(srcdir)/vcardparser $(all_includes)
    182  
    183 --- kdelibs-3.5.0/kdecore/Makefile.am   2005-10-10 11:06:02.000000000 -0400
    184 +++ kdelibs-3.5.0-new/kdecore/Makefile.am       2005-11-13 08:18:01.000000000 -0500
     176--- kdelibs-3.5.4/kdecore/Makefile.am   2005-10-10 08:06:02.000000000 -0700
     177+++ kdelibs-3.5.4-new/kdecore/Makefile.am       2006-07-27 10:33:34.000000000 -0700
    185178@@ -24,7 +24,7 @@
    186179 
    187180 if include_SVGICONS
    … …  
    200193 libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
    201194 libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
    202195        $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck
    203 --- kdelibs-3.5.0/kdecore/kglobalsettings.cpp   2005-10-10 11:06:03.000000000 -0400
    204 +++ kdelibs-3.5.0-new/kdecore/kglobalsettings.cpp       2005-11-13 08:18:01.000000000 -0500
     196--- kdelibs-3.5.4/kdecore/kglobalsettings.cpp   2005-10-10 08:06:03.000000000 -0700
     197+++ kdelibs-3.5.4-new/kdecore/kglobalsettings.cpp       2006-07-27 10:33:34.000000000 -0700
    205198@@ -491,7 +491,7 @@
    206199       s_desktopPath->append('/');
    207200 
    … …  
    211204     *s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
    212205     *s_trashPath = QDir::cleanDirPath( *s_trashPath );
    213206     if ( !s_trashPath->endsWith("/") )
    214 --- kdelibs-3.5.0/kdecore/ksocks.cpp    2005-10-10 11:06:03.000000000 -0400
    215 +++ kdelibs-3.5.0-new/kdecore/ksocks.cpp        2005-11-13 08:18:01.000000000 -0500
     207--- kdelibs-3.5.4/kdecore/ksocks.cpp    2005-10-10 08:06:03.000000000 -0700
     208+++ kdelibs-3.5.4-new/kdecore/ksocks.cpp        2006-07-27 10:33:34.000000000 -0700
    216209@@ -480,7 +480,7 @@
    217210                                                    ksocklen_t addrlen) {
    218211    if (_useSocks && F_connect)
    … …  
    283276 }
    284277 
    285278 
    286 --- kdelibs-3.5.0/kdecore/kstandarddirs.cpp     2005-10-10 11:06:02.000000000 -0400
    287 +++ kdelibs-3.5.0-new/kdecore/kstandarddirs.cpp 2005-11-13 08:18:01.000000000 -0500
     279--- kdelibs-3.5.4/kdecore/kstandarddirs.cpp     2005-10-10 08:06:02.000000000 -0700
     280+++ kdelibs-3.5.4-new/kdecore/kstandarddirs.cpp 2006-07-27 10:33:34.000000000 -0700
    288281@@ -1020,7 +1020,7 @@
    289282     if (!strcmp(type, "data"))
    290283        return "share/apps/";
    … …  
    294287     if (!strcmp(type, "icon"))
    295288        return "share/icons/";
    296289     if (!strcmp(type, "config"))
    297 --- kdelibs-3.5.0/kdecore/network/kresolvermanager.cpp  2005-09-10 04:27:10.000000000 -0400
    298 +++ kdelibs-3.5.0-new/kdecore/network/kresolvermanager.cpp      2005-11-13 08:18:01.000000000 -0500
    299 @@ -31,6 +31,7 @@
    300  
    301  #ifdef HAVE_RES_INIT
    302  # include <sys/stat.h>
    303 +# include <nameser.h>
    304  extern "C" {
    305  #   include <arpa/nameser.h>
    306  }
    307 --- kdelibs-3.5.0/kdecore/network/ksocketdevice.cpp     2005-09-10 04:27:10.000000000 -0400
    308 +++ kdelibs-3.5.0-new/kdecore/network/ksocketdevice.cpp 2005-11-13 08:18:01.000000000 -0500
    309 @@ -311,7 +311,7 @@
     290--- kdelibs-3.5.4/kdecore/network/ksocketdevice.cpp     2006-01-19 09:06:14.000000000 -0800
     291+++ kdelibs-3.5.4-new/kdecore/network/ksocketdevice.cpp 2006-07-27 10:33:34.000000000 -0700
     292@@ -316,7 +316,7 @@
    310293     }
    311294 
    312295   struct sockaddr sa;
    … …  
    315298   int newfd = kde_accept(m_sockfd, &sa, &len);
    316299   if (newfd == -1)
    317300     {
    318 @@ -385,7 +385,7 @@
     301@@ -390,7 +390,7 @@
    319302 
    320303 static int do_read_common(int sockfd, char *data, Q_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false)
    321304 {
    … …  
    324307   if (from)
    325308     {
    326309       from->setLength(len = 128); // arbitrary length
    327 @@ -527,7 +527,7 @@
    328    if (m_sockfd == -1)
    329      return KSocketAddress();   // not open, empty value
     310@@ -535,7 +535,7 @@
     311   if (d->local.family() != AF_UNSPEC)
     312     return d->local;
    330313 
    331314-  socklen_t len;
    332315+  kde_socklen_t len;
    333316   KSocketAddress localAddress;
    334317   localAddress.setLength(len = 32);    // arbitrary value
    335318   if (kde_getsockname(m_sockfd, localAddress.address(), &len) == -1)
    336 @@ -556,7 +556,7 @@
    337    if (m_sockfd == -1)
    338      return KSocketAddress();   // not open, empty value
     319@@ -567,7 +567,7 @@
     320   if (d->peer.family() != AF_UNSPEC)
     321     return d->peer;
    339322 
    340323-  socklen_t len;
    341324+  kde_socklen_t len;
    342325   KSocketAddress peerAddress;
    343326   peerAddress.setLength(len = 32);     // arbitrary value
    344327   if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
    345 --- kdelibs-3.5.0/kdecore/network/syssocket.h   2005-09-10 04:27:10.000000000 -0400
    346 +++ kdelibs-3.5.0-new/kdecore/network/syssocket.h       2005-11-13 08:18:01.000000000 -0500
     328--- kdelibs-3.5.4/kdecore/network/syssocket.h   2005-09-10 01:27:10.000000000 -0700
     329+++ kdelibs-3.5.4-new/kdecore/network/syssocket.h       2006-07-27 10:33:34.000000000 -0700
    347330@@ -53,7 +53,7 @@
    348331   }
    349332 
    … …  
    383366   {
    384367     return ::getsockname(fd, sa, len);
    385368   }
    386 --- kdelibs-3.5.0/kdeprint/configure.in.in      2005-09-10 04:27:43.000000000 -0400
    387 +++ kdelibs-3.5.0-new/kdeprint/configure.in.in  2005-11-13 08:18:01.000000000 -0500
     369--- kdelibs-3.5.4/kded/Makefile.am      2005-10-10 08:06:29.000000000 -0700
     370+++ kdelibs-3.5.4-new/kded/Makefile.am  2006-07-27 10:33:35.000000000 -0700
     371@@ -58,7 +58,10 @@
     372 servicetype_DATA = kdedmodule.desktop
     373 servicetypedir = $(kde_servicetypesdir)
     374 
     375-xdg_menu_DATA = applications.menu
     376+kde-applications.menu: applications.menu
     377+       cat applications.menu > kde-applications.menu
     378+
     379+xdg_menu_DATA = kde-applications.menu
     380 
     381 update_DATA = kded.upd
     382 updatedir = $(kde_datadir)/kconf_update
     383--- kdelibs-3.5.4/kded/kbuildsycoca.cpp 2005-11-08 14:39:36.000000000 -0800
     384+++ kdelibs-3.5.4-new/kded/kbuildsycoca.cpp     2006-07-27 10:33:35.000000000 -0700
     385@@ -379,7 +379,11 @@
     386      connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
     387              this, SLOT(slotCreateEntry(const QString &, KService **)));
     388             
     389-     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
     390+     VFolderMenu::SubMenu *kdeMenu;
     391+     if ( QFile::exists( "@FINKPREFIX@/etc/xdg/menus/kde-applications.menu" ) )
     392+       kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
     393+     else
     394+       kdeMenu = g_vfolder->parseMenu("applications.menu", true);
     395 
     396      KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
     397      entry->setLayoutInfo(kdeMenu->layoutList);
     398--- kdelibs-3.5.4/kdeprint/configure.in.in      2005-09-10 01:27:43.000000000 -0700
     399+++ kdelibs-3.5.4-new/kdeprint/configure.in.in  2006-07-27 10:33:35.000000000 -0700
    388400@@ -80,7 +80,7 @@
    389401 
    390402       dnl check if CUPS is at least 1.1.20
    … …  
    394406       if test "$ac_have_new_cups" = "yes"; then
    395407        AC_DEFINE(HAVE_CUPS_NO_PWD_CACHE, 1, CUPS doesn't have password caching)
    396408       fi
    397 --- kdelibs-3.5.0/kdesu/su.cpp  2005-09-10 04:27:02.000000000 -0400
    398 +++ kdelibs-3.5.0-new/kdesu/su.cpp      2005-11-13 08:19:28.000000000 -0500
    399 @@ -75,6 +75,8 @@
    400  
    401      QCStringList args;
    402  
    403 +    args += "-c";
    404 +    args += "staff";
    405      if ((m_Scheduler != SchedNormal) || (m_Priority > 50))
    406          args += "root";
    407      else
    408 @@ -82,7 +84,6 @@
    409      
    410      args += "-c";
    411      args += QCString(__KDE_BINDIR) + "/kdesu_stub";
    412 -    args += "-";
    413  
    414      QCString command = __PATH_SU;
    415      if (::access(__PATH_SU, X_OK) != 0)
    416 --- kdelibs-3.5.0/kdeui/Makefile.am     2005-10-10 11:06:38.000000000 -0400
    417 +++ kdelibs-3.5.0-new/kdeui/Makefile.am 2005-11-13 08:18:02.000000000 -0500
     409--- kdelibs-3.5.4/kdeui/Makefile.am     2005-10-10 08:06:38.000000000 -0700
     410+++ kdelibs-3.5.4-new/kdeui/Makefile.am 2006-07-27 10:33:35.000000000 -0700
    418411@@ -27,10 +27,10 @@
    419412 AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
    420413 
    … …  
    428421 libkspell_la_LIBADD = libkdeui.la
    429422 libkspell_la_SOURCES = dummy.cpp
    430423 
    431 --- kdelibs-3.5.0/kimgio/Makefile.am    2005-09-10 04:26:42.000000000 -0400
    432 +++ kdelibs-3.5.0-new/kimgio/Makefile.am        2005-11-13 08:18:02.000000000 -0500
     424--- kdelibs-3.5.4/kimgio/Makefile.am    2005-09-10 01:26:42.000000000 -0700
     425+++ kdelibs-3.5.4-new/kimgio/Makefile.am        2006-07-27 10:33:35.000000000 -0700
    433426@@ -21,7 +21,7 @@
    434427              kimg_pcx.la kimg_tga.la kimg_rgb.la kimg_xcf.la kimg_dds.la $(KIMGIO_EXR_MODULES) \
    435428                         kimg_psd.la kimg_hdr.la
    … …  
    439432 
    440433 kimg_tiff_la_SOURCES = tiffr.cpp
    441434 kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
    442 --- kdelibs-3.5.0/kinit/Makefile.am     2005-10-10 11:05:37.000000000 -0400
    443 +++ kdelibs-3.5.0-new/kinit/Makefile.am 2005-11-13 08:18:02.000000000 -0500
     435--- kdelibs-3.5.4/kinit/Makefile.am     2005-10-10 08:05:37.000000000 -0700
     436+++ kdelibs-3.5.4-new/kinit/Makefile.am 2006-07-27 10:33:35.000000000 -0700
    444437@@ -15,7 +15,7 @@
    445438 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    446439 #    Boston, MA 02110-1301, USA.
    … …  
    450443 
    451444 SUBDIRS = . tests
    452445 
    453 --- kdelibs-3.5.0/kio/kssl/kopenssl.cc  2005-10-10 11:05:44.000000000 -0400
    454 +++ kdelibs-3.5.0-new/kio/kssl/kopenssl.cc      2005-11-13 08:18:02.000000000 -0500
    455 @@ -322,6 +322,7 @@
     446--- kdelibs-3.5.4/kio/kssl/kopenssl.cc  2006-07-22 01:16:39.000000000 -0700
     447+++ kdelibs-3.5.4-new/kio/kssl/kopenssl.cc      2006-07-27 10:33:35.000000000 -0700
     448@@ -323,6 +323,7 @@
    456449              #elif defined(_AIX)
    457450              << "libssl.a(libssl.so.0)"
    458451             #elif defined(__APPLE__)
    … …  
    460453             << "libssl.dylib"
    461454             << "libssl.0.9.dylib"
    462455              #else
    463 @@ -339,6 +340,7 @@
     456@@ -340,6 +341,7 @@
    464457              #elif defined(_AIX)
    465458              << "libcrypto.a(libcrypto.so.0)"
    466459             #elif defined(__APPLE__)
    … …  
    468461             << "libcrypto.dylib"
    469462             << "libcrypto.0.9.dylib"
    470463             #else
    471 --- kdelibs-3.5.0/kio/misc/kpac/Makefile.am     2005-09-10 04:26:47.000000000 -0400
    472 +++ kdelibs-3.5.0-new/kio/misc/kpac/Makefile.am 2005-11-13 08:20:00.000000000 -0500
     464--- kdelibs-3.5.4/kio/misc/kpac/Makefile.am     2005-09-10 01:26:47.000000000 -0700
     465+++ kdelibs-3.5.4-new/kio/misc/kpac/Makefile.am 2006-07-27 10:33:35.000000000 -0700
    473466@@ -10,7 +10,7 @@
    474467 kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
    475468                              downloader.cpp discovery.cpp
    … …  
    479472 
    480473 kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
    481474 kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
    482 --- kdelibs-3.5.0/kwallet/backend/sha1.cc       2005-11-08 17:39:19.000000000 -0500
    483 +++ kdelibs-3.5.0-new/kwallet/backend/sha1.cc   2005-11-13 08:18:03.000000000 -0500
    484 @@ -23,6 +23,9 @@
    485  #ifdef HAVE_SYS_TYPES_H
    486  #include <sys/types.h>
    487  #endif
    488 +#ifdef HAVE_STDINT_H
    489 +#include <stdint.h> /* For uintXX_t on OSX */
    490 +#endif
    491  #ifdef HAVE_SYS_BITYPES_H
    492  #include <sys/bitypes.h> /* For uintXX_t on Tru64 */
    493  #endif
    494 --- kdelibs-3.5.0/kded/kbuildsycoca.cpp Tue Nov  8 17:39:36 2005
    495 +++ kdelibs-3.5.0-new/kded/kbuildsycoca.cpp     Mon Dec 12 14:39:41 2005
    496 @@ -379,7 +379,7 @@
    497       connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
    498               this, SLOT(slotCreateEntry(const QString &, KService **)));
    499              
    500 -     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
    501 +     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
    502  
    503       KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
    504       entry->setLayoutInfo(kdeMenu->layoutList);
    505 --- kdelibs-3.5.1/kded/Makefile.am      Mon Oct 10 11:06:29 2005
    506 +++ kdelibs-3.5.1-new/kded/Makefile.am  Sun Jan 22 10:14:31 2006
    507 @@ -58,7 +58,10 @@
    508  servicetype_DATA = kdedmodule.desktop
    509  servicetypedir = $(kde_servicetypesdir)
    510  
    511 -xdg_menu_DATA = applications.menu
    512 +kde-applications.menu: applications.menu
    513 +       cat applications.menu > kde-applications.menu
    514 +
    515 +xdg_menu_DATA = kde-applications.menu
    516  
    517  update_DATA = kded.upd
    518  updatedir = $(kde_datadir)/kconf_update

  • kdelibs3/files/patch-ipprequest.cpp

     
    1 --- kdelibs-3.5.1/kdeprint/cups/ipprequest.cpp~ 2005-10-11 00:06:30.000000000 +0900
    2 +++ kdelibs-3.5.1/kdeprint/cups/ipprequest.cpp  2006-08-17 17:38:42.000000000 +0900
    3 @@ -511,6 +511,10 @@
    4         cupsFreeOptions(n, options);
    5  
    6         // find an remove that annoying "document-format" attribute
    7 +#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
    8 +       ipp_attribute_t *attr = ippFindAttribute(request_, "document-format", IPP_TAG_NAME);
    9 +       ippDeleteAttribute(request_, attr);
    10 +#else
    11         ipp_attribute_t *attr = request_->attrs;
    12         while (attr)
    13         {
    14 @@ -523,4 +527,5 @@
    15                 }
    16                 attr = attr->next;
    17         }
    18 +#endif
    19  }

  • kdelibs3/files/InstallScript.sh

     
    11#!/bin/sh -e
    22
    3         export HOME=/tmp PREFIX="%p" QTDOCDIR="%p/share/doc/qt3/html"
     3        export PREFIX="%p" USE_UNSERMAKE=1
    44        . ./environment-helper.sh
    55
    6 #darwinports
    7         export UNSERMAKE="no"
    8 
    9         ./build-helper.sh install        %N %v %r make -j1 install DESTDIR=%d
     6        ./build-helper.sh install        %N %v %r unsermake -p -j1 install DESTDIR=%d
    107#apidox#./build-helper.sh install-apidox %N %v %r make -j1 install-apidox install-apidox-recurse DESTDIR=%d
    118
    129        rm -rf %i/share/icons/hicolor/index.theme

  • kdelibs3/files/CompileScript.sh

     
    11#!/bin/sh -e
    22
    3         export HOME=/tmp PREFIX="%p" QTDOCDIR="%p/share/doc/qt3/html"
    4         export lt_cv_sys_max_cmd_len=65536
     3        export PREFIX="%p" USE_UNSERMAKE=1
    54        . ./environment-helper.sh
    65
    7 #darwinports
    8         export UNSERMAKE="no"
    9 
    10         PRODUCT_VERSION=`uname -r`
    11 
    12         case $PRODUCT_VERSION in
     6        case $SW_VERSION in
    137                6*|7*)
    148                        export CPPFLAGS="$CPPFLAGS -DHAVE_SYS_EXEC_H=1"
    159                        ;;
    … …  
    1711
    1812        export CPPFLAGS="-I/usr/include/gssapi $CPPFLAGS"
    1913
    20         export CC=gcc CXX=g++
    21 
    2214        ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
    2315        ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
    24         ./build-helper.sh make      %N %v %r make all all_libraries="$ALL_LIBRARIES"
     16        ./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS
    2517#apidox#./build-helper.sh apidox    %N %v %r make apidox all_libraries="$ALL_LIBRARIES"

  • kdelibs3/Portfile

     
    11# $Id$
    22
    3 #Synced with Fink, Version 3.5.1-1024
     3#Synced with Fink, Version 3.5.4-1021
    44
    55PortSystem 1.0
    66name            kdelibs3
    7 version         3.5.1
    8 revision        4
    9 set kdeadmin    kde-admindir-3.5.1
     7version         3.5.4
     8set kdeadmin    kde-admindir-252
    109categories      kde
    1110maintainers     ben@macports.org takanori@macports.org
    1211description     Essential libraries for KDE applications. \
    1312                NB No KDE sound support.
    1413platforms       darwin
    15 master_sites    opendarwin::kde351 \
     14master_sites    opendarwin::kde354 \
    1615                opendarwin::admin
    1716#               kde:stable/${version}/src
    1817#               http://ranger.befunk.com/fink/:admin
    19 extract.suffix  .tar.bz2
    2018use_bzip2       yes
    2119distname        kdelibs-${version}
    22 distfiles       ${distname}.tar.bz2:kde351 \
     20distfiles       ${distname}.tar.bz2:kde354 \
    2321                ${kdeadmin}.tar.bz2:admin
    2422depends_build   port:autoconf \
    25                 port:automake
     23                port:unsermake
    2624depends_lib     lib:libpoll:poll-emulator \
    2725                lib:libX11.6:XFree86 \
    2826                port:aspell \
    … …  
    3230                port:fontconfig \
    3331                port:freetype \
    3432                port:gettext \
     33                port:glib2 \
    3534                port:hicolor-icon-theme \
    3635                port:jasper \
    3736                port:jpeg \
    … …  
    5251                port:Xft2 \
    5352                port:xrender \
    5453                port:zlib
     54#               port:dbus
     55#               port:dbus-qt3
     56#               port:hal
    5557
    56 checksums       ${distname}.tar.bz2 md5 2a22193ae7c23f3759b02723dab02d30 \
    57                 ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
     58checksums       ${distname}.tar.bz2 md5 979d056ca0e21c12caed270126e60e3e \
     59                ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
    5860
    59 extract.only ${distname}.tar.bz2
    60 post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
     61extract.only    ${distname}.tar.bz2
     62post-extract    { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
    6163
    62 patchfiles      kdelibs3-unified.patch patch-ipprequest.cpp patch-CVE-2006-4811
     64patchfiles      kdelibs3-unified.patch patch-CVE-2006-4811
    6365patch           {
    6466                cd ${worksrcpath}
    6567                foreach file $patchfiles {
    66                     system "sed -e 's,@FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
     68                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
    6769                }
     70                system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' admin/*"
    6871}
    69 post-patch      {
    70                 reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
    71                 reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
     72post-patch      {
     73                reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
    7274                reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
    73                 reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
    74                 foreach file [glob ${worksrcpath}/admin/*] {
    75                     reinplace "s|-O2|-Os|g" $file
    76                     reinplace "s|doc/HTML|doc/kde|g" $file
    77                     reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
    78                 }
    7975                foreach file {CompileScript.sh InstallScript.sh} {
    80                     file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
     76                    file copy ${filespath}/${file} ${worksrcpath}
    8177                    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
    8278                    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
    8379                    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
    … …  
    8985                }
    9086}
    9187
    92 configure.args --enable-cups --with-ldap=framework --with-gssapi=framework --with-distribution='DarwinPorts/Mac OS X' --without-arts
     88configure.args --enable-cups --with-ldap=framework --with-gssapi=framework --with-distribution='MacPorts/Mac OS X' --without-arts
    9389
    9490configure       {
    9591                if {[file exists ${prefix}/bin/cups-config]} {
    … …  
    10197build           { system "cd ${worksrcpath} && ./CompileScript.sh" }
    10298destroot        { system "cd ${worksrcpath} && ./InstallScript.sh" }
    10399
    104 post-destroot   {
     100post-destroot   {
    105101                xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
    106102                xinstall -m 644 -W ${worksrcpath} COPYING COPYING.LIB INSTALL ${destroot}${prefix}/share/doc/${name}
    107103}
    … …  
    117113                exit 1
    118114}
    119115
    120 variant apidox {
    121         depends_lib-append port:doxygen
    122         post-patch { foreach f {CompileScript.sh InstallScript.sh} { reinplace "s|#apidox#||g" ${worksrcpath}/${f} }}
     116variant apidox  {
     117                depends_lib-append port:doxygen
     118                post-patch { foreach f {CompileScript.sh InstallScript.sh} { reinplace "s|#apidox#||g" ${worksrcpath}/${f} }}
    123119}

  • kdenetwork3/files/InstallScript.sh

     
    11#!/bin/sh -e
    22
    3         export PREFIX="%p"
     3        export PREFIX="%p" USE_UNSERMAKE=1
    44        . ./environment-helper.sh
    55
    6 #darwinports
    7         export UNSERMAKE="no"
     6        ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
    87
    9         ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
    10 
    118        mkdir -p %i/share/doc/installed-packages
    129        touch %i/share/doc/installed-packages/%N
    1310        touch %i/share/doc/installed-packages/%N-base

  • kdenetwork3/files/CompileScript.sh

     
    11#!/bin/sh -e
    22
    3         export HOME=/tmp
    4         export PREFIX="%p"
     3        export PREFIX="%p" USE_UNSERMAKE=1 CC=gcc
    54        . ./environment-helper.sh
    6         export lt_cv_sys_max_cmd_len=65536
    75
    8 #darwinports
    9         export UNSERMAKE="no"
    10 
    11         export CC=gcc CXX=g++
    12 
    136        ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
    147        ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
    15         ./build-helper.sh make      %N %v %r make all all_libraries="$ALL_LIBRARIES"
     8        ./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS

  • kdenetwork3/files/kdenetwork3.patch

     
    1 --- kdenetwork-3.4.2/ktalkd/ktalkd/talkd.cpp    2005-05-23 08:08:13.000000000 -0400
    2 +++ kdenetwork-3.4.2-new/ktalkd/ktalkd/talkd.cpp        2005-09-17 16:01:46.000000000 -0400
     1
     2--- kdenetwork-3.5.4/kopete/protocols/oscar/liboscar/oscartypes.h       2006-07-22 04:11:33.000000000 -0400
     3+++ kdenetwork-3.5.4-new/kopete/protocols/oscar/liboscar/oscartypes.h   2006-08-03 12:21:04.000000000 -0400
     4@@ -237,7 +237,7 @@
     5        const WORD ICQ_MAJOR                    = 0x0014;
     6        const WORD ICQ_MINOR                    = 0x0034;
     7        const WORD ICQ_POINT                    = 0x0000;
     8-       const WORD ICQ_BUILD                    = 0x0A0F;
     9+       const WORD ICQ_BUILD                    = 0x0BB8;
     10        const char ICQ_OTHER[]                  = { 0x00, 0x00, 0x04, 0x3d };
     11        const char ICQ_COUNTRY[]                = "us";
     12        const char ICQ_LANG[]                   = "en";
     13--- kdenetwork-3.5.4/ktalkd/ktalkd/talkd.cpp    2006-03-17 05:12:34.000000000 -0500
     14+++ kdenetwork-3.5.4-new/ktalkd/ktalkd/talkd.cpp        2006-08-03 12:19:57.000000000 -0400
    315@@ -183,7 +183,7 @@
    416        struct hostent *hp;
    517        struct sockaddr_in sn;
    … …  
    1830        int do_debug=0, do_badpackets=0, ch;
    1931 
    2032        new KInstance("ktalkd"); // for KConfig and friends
    21 --- kdenetwork-3.4.2/lanbrowsing/lisa/netmanager.cpp    2005-05-23 08:07:29.000000000 -0400
    22 +++ kdenetwork-3.4.2-new/lanbrowsing/lisa/netmanager.cpp        2005-09-17 16:01:46.000000000 -0400
     33--- kdenetwork-3.5.4/lanbrowsing/lisa/netmanager.cpp    2005-09-10 04:20:14.000000000 -0400
     34+++ kdenetwork-3.5.4-new/lanbrowsing/lisa/netmanager.cpp        2006-08-03 12:19:57.000000000 -0400
    2335@@ -413,7 +413,7 @@
    2436          {
    2537             mdcerr<<"NetManager::run: on m_listenFD"<<std::endl;
    … …  
    4759    mdcerr<<" NetManager::findServerServer: broadcasting to: "
    4860    <<std::ios::hex<<m_broadcastAddress<<std::ios::dec<<std::endl;
    4961   
    50 --- kdenetwork-3.4.2/lanbrowsing/lisa/netscanner.cpp    2005-05-23 08:07:29.000000000 -0400
    51 +++ kdenetwork-3.4.2-new/lanbrowsing/lisa/netscanner.cpp        2005-09-17 16:01:46.000000000 -0400
    52 @@ -561,7 +561,7 @@
     62--- kdenetwork-3.5.4/lanbrowsing/lisa/netscanner.cpp    2006-07-22 04:11:31.000000000 -0400
     63+++ kdenetwork-3.5.4-new/lanbrowsing/lisa/netscanner.cpp        2006-08-03 12:19:57.000000000 -0400
     64@@ -550,7 +550,7 @@
    5365          select(0,0,0,0,&tv1);
    5466          //now read the answers, hopefully
    5567          struct sockaddr_in fromAddr;

  • kdenetwork3/Portfile

     
    11# $Id$
    22
    3 #Synced with Fink, Version 3.5.1-1023
     3#Synced with Fink, Version 3.5.4-1021
    44
    55PortSystem 1.0
    66name            kdenetwork3
    7 version         3.5.1
    8 revision        2
    9 set kdeadmin    kde-admindir-3.5.1
     7version         3.5.4
     8set kdeadmin    kde-admindir-252
    109categories      kde
    1110maintainers     ben@macports.org takanori@macports.org
    1211description     KDE network tools. \
    1312                NB No KDE sound support.
    1413platforms       darwin
    15 master_sites    opendarwin::kde351 \
     14master_sites    opendarwin::kde354 \
    1615                opendarwin::admin
    1716#               kde:stable/${version}/src
    1817#               http://ranger.befunk.com/fink/:admin
    19 extract.suffix  .tar.bz2
    2018use_bzip2       yes
    2119distname        kdenetwork-${version}
    22 distfiles       ${distname}.tar.bz2:kde351 \
     20distfiles       ${distname}.tar.bz2:kde354 \
    2321                ${kdeadmin}.tar.bz2:admin
    2422depends_build   port:autoconf \
    25                 port:automake
     23                port:unsermake
    2624depends_lib     port:kdebase3 \
    27                 port:glib2 \
    28                 port:openslp \
    29                 port:xmms
     25                port:openslp
     26#               port:ekg
     27#               port:gtk1
     28#               port:qca
     29#               port:xmms
    3030
    3131# what about libgadu?
    3232
    33 checksums       ${distname}.tar.bz2 md5 02ced8c14c80f28635056488949d56d7 \
    34                 ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
     33checksums       ${distname}.tar.bz2 md5 81660b1a73e81b6c01a55861c154dd3b \
     34                ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
    3535
    36 extract.only ${distname}.tar.bz2
    37 post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
     36extract.only    ${distname}.tar.bz2
     37post-extract    { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
    3838
    3939patchfiles      kdenetwork3.patch
    4040patch           {
    4141                cd ${worksrcpath}
    4242                foreach file $patchfiles {
    43                     system "sed -e 's,@FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
     43                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
    4444                }
     45                system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' admin/*"
    4546}
    46 post-patch      {
    47                 reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
    48                 reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
     47post-patch      {
     48                reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
    4949                reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
    50                 reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
    51                 foreach file [glob ${worksrcpath}/admin/*] {
    52                     reinplace "s|-O2|-Os|g" $file
    53                     reinplace "s|doc/HTML|doc/kde|g" $file
    54                     reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
    55                 }
    5650                foreach file {CompileScript.sh InstallScript.sh} {
    57                     file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
     51                    file copy ${filespath}/${file} ${worksrcpath}
    5852                    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
    5953                    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
    6054                    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
    … …  
    6660                }
    6761}
    6862
    69 configure.args  --with-distribution='DarwinPorts/Mac OS X' --without-arts
     63configure.args  --with-distribution='MacPorts/Mac OS X' --without-arts
    7064# --with-libgadu-libs=${prefix}/lib --with-libgadu-includes=${prefix}/include
    7165
    7266configure       {}
    7367build           { system "cd ${worksrcpath} && ./CompileScript.sh" }
    7468destroot        { system "cd ${worksrcpath} && ./InstallScript.sh" }
    7569
    76 post-destroot   {
     70post-destroot   {
    7771                xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
    7872                xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING INSTALL README ${destroot}${prefix}/share/doc/${name}
    7973}
    80 
    81 platform darwin 6 {
    82         depends_lib-append      lib:libdl:dlcompat
    83 }
    84 

  • kdepim3/files/InstallScript.sh

     
    11#!/bin/sh -e
    22
    3         export PREFIX="%p"
     3        export PREFIX="%p" USE_UNSERMAKE=1
    44        . ./environment-helper.sh
    55
    6 #darwinports
    7         export UNSERMAKE="no"
     6        ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
    87
    9         ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
    10 
    118        mkdir -p %i/share/doc/installed-packages
    129        touch %i/share/doc/installed-packages/%N
    1310        touch %i/share/doc/installed-packages/%N-base

  • kdepim3/files/CompileScript.sh

     
    11#!/bin/sh -e
    22
    3         export HOME=/tmp
    4         export PREFIX="%p"
     3        export PREFIX="%p" USE_UNSERMAKE=1
    54        . ./environment-helper.sh
    6         export lt_cv_sys_max_cmd_len=65536
     5#fink
     6#       export ac_cv_path_GPGME_CONFIG="%p/bin/gpgme-config --thread=pthread"
     7#macports
     8        export ac_cv_path_GPGME_CONFIG="%p/bin/gpgme-config --thread=pth"
    79
    8 #darwinports
    9         export UNSERMAKE="no"
    10 
    1110        export CC=gcc CXX=g++
    1211
     12        ranlib %p/lib/libgpg*.a >/dev/null 2>&1
    1313        ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
    1414        ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
    15         ./build-helper.sh make      %N %v %r make all all_libraries="$ALL_LIBRARIES"
     15
     16#  perl -pi -e 's,yytext_ptr,libical_ptr,g' libical/src/libical/icallexer.c
     17#  perl -pi -e 's,yytext_ptr,libicalss_ptr,g' libical/src/libicalss/icalsslexer.c
     18#  perl -pi -e 's, holidays , ,g' korganizer/plugins/Makefile
     19
     20        ./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS

  • kdepim3/files/kdepim3.patch

     
    1 --- kdepim-3.5.0/akregator/src/Makefile.am      2005-10-10 11:02:17.000000000 -0400
    2 +++ kdepim-3.5.0-new/akregator/src/Makefile.am  2005-12-04 13:02:32.000000000 -0500
     1
     2--- kdepim-3.5.4/akregator/src/Makefile.am      2006-05-22 14:10:40.000000000 -0400
     3+++ kdepim-3.5.4-new/akregator/src/Makefile.am  2006-07-30 12:26:42.000000000 -0400
    34@@ -16,12 +16,13 @@
    45 #########################################################################
    56 # this is the program that gets installed.  it's name is used for all
    … …  
    2728 libakregatorprivate_la_LIBADD =        $(top_builddir)/libkdepim/libkdepim.la \
    2829        $(top_builddir)/akregator/src/librss/librsslocal.la $(LIB_KHTML)
    2930 
    30 --- kdepim-3.5.0/akregator/src/main.cpp 2005-09-10 04:23:38.000000000 -0400
    31 +++ kdepim-3.5.0-new/akregator/src/main.cpp     2005-12-04 11:37:56.000000000 -0500
     31--- kdepim-3.5.4/akregator/src/main.cpp 2005-09-10 04:23:38.000000000 -0400
     32+++ kdepim-3.5.4-new/akregator/src/main.cpp     2006-07-30 12:26:42.000000000 -0400
    3233@@ -83,7 +83,7 @@
    3334 
    3435 } // namespace Akregator
    … …  
    3839 {
    3940     Akregator::AboutData about;
    4041     KCmdLineArgs::init(argc, argv, &about);
    41 --- kdepim-3.5.0/certmanager/Makefile.am        2005-09-10 04:23:51.000000000 -0400
    42 +++ kdepim-3.5.0-new/certmanager/Makefile.am    2005-12-04 11:37:53.000000000 -0500
     42--- kdepim-3.5.4/certmanager/Makefile.am        2005-09-10 04:23:51.000000000 -0400
     43+++ kdepim-3.5.4-new/certmanager/Makefile.am    2006-07-30 12:26:42.000000000 -0400
    4344@@ -4,9 +4,11 @@
    4445 
    4546 INCLUDES = -I$(srcdir)/lib -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
    … …  
    6566 
    6667 rcdir = $(kde_datadir)/kleopatra
    6768 rc_DATA = kleopatraui.rc
    68 --- kdepim-3.5.0/certmanager/conf/Makefile.am   2005-10-10 11:02:19.000000000 -0400
    69 +++ kdepim-3.5.0-new/certmanager/conf/Makefile.am       2005-12-04 13:02:46.000000000 -0500
     69--- kdepim-3.5.4/certmanager/conf/Makefile.am   2005-10-10 11:02:19.000000000 -0400
     70+++ kdepim-3.5.4-new/certmanager/conf/Makefile.am       2006-07-30 12:26:42.000000000 -0400
    7071@@ -15,7 +15,7 @@
    7172        appearanceconfigwidget.cpp \
    7273        dnorderconfigpage.cpp
    … …  
    7677 kcm_kleopatra_la_LIBADD = ../lib/libkleopatra.la $(LIB_KDEUI)
    7778 
    7879 kde_services_DATA = \
    79 --- kdepim-3.5.0/certmanager/kwatchgnupg/Makefile.am    2005-09-10 04:23:49.000000000 -0400
    80 +++ kdepim-3.5.0-new/certmanager/kwatchgnupg/Makefile.am        2005-12-04 11:37:53.000000000 -0500
     80--- kdepim-3.5.4/certmanager/kwatchgnupg/Makefile.am    2005-09-10 04:23:49.000000000 -0400
     81+++ kdepim-3.5.4-new/certmanager/kwatchgnupg/Makefile.am        2006-07-30 12:26:42.000000000 -0400
    8182@@ -2,9 +2,11 @@
    8283 
    8384 INCLUDES = -I$(top_srcdir)/certmanager/lib -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
    … …  
    103104 
    104105 rcdir = $(kde_datadir)/kwatchgnupg
    105106 rc_DATA = kwatchgnupgui.rc
    106 --- kdepim-3.5.0/certmanager/kwatchgnupg/main.cpp       2005-09-10 04:23:49.000000000 -0400
    107 +++ kdepim-3.5.0-new/certmanager/kwatchgnupg/main.cpp   2005-12-04 11:37:53.000000000 -0500
     107--- kdepim-3.5.4/certmanager/kwatchgnupg/main.cpp       2005-09-10 04:23:49.000000000 -0400
     108+++ kdepim-3.5.4-new/certmanager/kwatchgnupg/main.cpp   2006-07-30 12:26:42.000000000 -0400
    108109@@ -74,7 +74,7 @@
    109110   return KUniqueApplication::newInstance();
    110111 }
    … …  
    114115 {
    115116   AboutData aboutData;
    116117 
    117 --- kdepim-3.5.0/certmanager/main.cpp   2005-09-10 04:23:51.000000000 -0400
    118 +++ kdepim-3.5.0-new/certmanager/main.cpp       2005-12-04 11:37:53.000000000 -0500
     118--- kdepim-3.5.4/certmanager/main.cpp   2005-09-10 04:23:51.000000000 -0400
     119+++ kdepim-3.5.4-new/certmanager/main.cpp       2006-07-30 12:26:42.000000000 -0400
    119120@@ -46,7 +46,7 @@
    120121 #include <kglobal.h>
    121122 #include <kiconloader.h>
    … …  
    125126 {
    126127   AboutData aboutData;
    127128 
    128 --- kdepim-3.5.0/kabc/frontend/Makefile.am      2005-09-10 04:24:24.000000000 -0400
    129 +++ kdepim-3.5.0-new/kabc/frontend/Makefile.am  2005-12-04 11:37:53.000000000 -0500
     129--- kdepim-3.5.4/kabc/frontend/Makefile.am      2005-09-10 04:24:24.000000000 -0400
     130+++ kdepim-3.5.4-new/kabc/frontend/Makefile.am  2006-07-30 12:26:42.000000000 -0400
    130131@@ -2,9 +2,11 @@
    131132 
    132133 METASOURCES = AUTO
    … …  
    143144+kabcfrontend_la_LIBADD = -lkabc $(LIB_KDECORE)
    144145+kabcfrontend_la_SOURCES = main.cpp mainWindow.ui
    145146 
    146 --- kdepim-3.5.0/kabc/frontend/main.cpp 2005-09-10 04:24:24.000000000 -0400
    147 +++ kdepim-3.5.0-new/kabc/frontend/main.cpp     2005-12-04 11:37:53.000000000 -0500
     147--- kdepim-3.5.4/kabc/frontend/main.cpp 2005-09-10 04:24:24.000000000 -0400
     148+++ kdepim-3.5.4-new/kabc/frontend/main.cpp     2006-07-30 12:26:42.000000000 -0400
    148149@@ -6,7 +6,7 @@
    149150 
    150151 #include "mainWindow.h"
    … …  
    154155 {
    155156   KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
    156157   KCmdLineArgs::init(argc,argv,&aboutData);
    157 --- kdepim-3.5.0/kabc/kabc2mutt/Makefile.am     2005-09-10 04:24:24.000000000 -0400
    158 +++ kdepim-3.5.0-new/kabc/kabc2mutt/Makefile.am 2005-12-04 11:37:53.000000000 -0500
     158--- kdepim-3.5.4/kabc/kabc2mutt/Makefile.am     2005-09-10 04:24:24.000000000 -0400
     159+++ kdepim-3.5.4-new/kabc/kabc2mutt/Makefile.am 2006-07-30 12:26:42.000000000 -0400
    159160@@ -2,11 +2,13 @@
    160161 
    161162 METASOURCES = AUTO
    … …  
    174175 
    175176 messages: rc.cpp
    176177        $(XGETTEXT) *.cpp -o $(podir)/kabc2mutt.pot
    177 --- kdepim-3.5.0/kabc/kabc2mutt/main.cpp        2005-09-10 04:24:24.000000000 -0400
    178 +++ kdepim-3.5.0-new/kabc/kabc2mutt/main.cpp    2005-12-04 11:37:53.000000000 -0500
     178--- kdepim-3.5.4/kabc/kabc2mutt/main.cpp        2005-09-10 04:24:24.000000000 -0400
     179+++ kdepim-3.5.4-new/kabc/kabc2mutt/main.cpp    2006-07-30 12:26:42.000000000 -0400
    179180@@ -41,7 +41,7 @@
    180181 };
    181182 
    … …  
    185186 {
    186187   KApplication::disableAutoDcopRegistration();
    187188   KCmdLineArgs::init( argc, argv, appName, programName, description, version );
    188 --- kdepim-3.5.0/kaddressbook/Makefile.am       2005-10-10 11:02:25.000000000 -0400
    189 +++ kdepim-3.5.0-new/kaddressbook/Makefile.am   2005-12-04 13:01:19.000000000 -0500
     189--- kdepim-3.5.4/kaddressbook/Makefile.am       2005-10-10 11:02:25.000000000 -0400
     190+++ kdepim-3.5.4-new/kaddressbook/Makefile.am   2006-07-30 12:26:43.000000000 -0400
    190191@@ -15,11 +15,12 @@
    191192           -I$(top_srcdir)/akregator/src \
    192193           $(all_includes)
    … …  
    213214 
    214215 rcdir = $(kde_datadir)/kaddressbook
    215216 rc_DATA = kaddressbookui.rc kaddressbook_part.rc
    216 --- kdepim-3.5.0/kaddressbook/main.cpp  2005-11-08 17:33:33.000000000 -0500
    217 +++ kdepim-3.5.0-new/kaddressbook/main.cpp      2005-12-04 11:37:53.000000000 -0500
     217--- kdepim-3.5.4/kaddressbook/main.cpp  2005-11-08 17:33:33.000000000 -0500
     218+++ kdepim-3.5.4-new/kaddressbook/main.cpp      2006-07-30 12:26:43.000000000 -0400
    218219@@ -109,7 +109,7 @@
    219220   return 0;
    220221 }
    … …  
    224225 {
    225226   KLocale::setMainCatalogue( "kaddressbook" );
    226227 
    227 --- kdepim-3.5.0/kandy/src/Makefile.am  2005-09-10 04:24:42.000000000 -0400
    228 +++ kdepim-3.5.0-new/kandy/src/Makefile.am      2005-12-04 13:03:00.000000000 -0500
     228--- kdepim-3.5.4/kandy/src/Makefile.am  2005-09-10 04:24:42.000000000 -0400
     229+++ kdepim-3.5.4-new/kandy/src/Makefile.am      2006-07-30 12:26:43.000000000 -0400
    229230@@ -1,10 +1,12 @@
    230231-bin_PROGRAMS = kandy kandy_client
    231232+bin_PROGRAMS =
    … …  
    256257 
    257258 METASOURCES = AUTO
    258259 
    259 --- kdepim-3.5.0/kandy/src/kandy_client.cpp     2005-09-10 04:24:42.000000000 -0400
    260 +++ kdepim-3.5.0-new/kandy/src/kandy_client.cpp 2005-12-04 11:37:54.000000000 -0500
     260--- kdepim-3.5.4/kandy/src/kandy_client.cpp     2005-09-10 04:24:42.000000000 -0400
     261+++ kdepim-3.5.4-new/kandy/src/kandy_client.cpp 2006-07-30 12:26:43.000000000 -0400
    261262@@ -27,7 +27,7 @@
    262263 #include <qdatastream.h>
    263264 #include <qstring.h>
    … …  
    267268 {
    268269     KApplication app(argc, argv, "kandy_client", false);
    269270 
    270 --- kdepim-3.5.0/kandy/src/main.cpp     2005-09-10 04:24:42.000000000 -0400
    271 +++ kdepim-3.5.0-new/kandy/src/main.cpp 2005-12-04 11:37:54.000000000 -0500
     271--- kdepim-3.5.4/kandy/src/main.cpp     2005-09-10 04:24:42.000000000 -0400
     272+++ kdepim-3.5.4-new/kandy/src/main.cpp 2006-07-30 12:26:43.000000000 -0400
    272273@@ -85,7 +85,7 @@
    273274 #endif
    274275 }
    … …  
    278279 {
    279280   KAboutData about("kandy", I18N_NOOP("Kandy"), version, description,
    280281                    KAboutData::License_GPL, "(C) 2001 Cornelius Schumacher",0,
    281 --- kdepim-3.5.0/kitchensync/kitchensync/Makefile.am    2005-09-10 04:24:23.000000000 -0400
    282 +++ kdepim-3.5.0-new/kitchensync/kitchensync/Makefile.am        2005-12-04 11:37:54.000000000 -0500
     282--- kdepim-3.5.4/kitchensync/kitchensync/Makefile.am    2005-09-10 04:24:23.000000000 -0400
     283+++ kdepim-3.5.4-new/kitchensync/kitchensync/Makefile.am        2006-07-30 12:26:43.000000000 -0400
    283284@@ -8,10 +8,12 @@
    284285 
    285286 METASOURCES = AUTO
    … …  
    297298   ../libksync/libksync2.la
    298299-kitchensync_LDFLAGS = $(KDE_RPATH) $(all_libraries)
    299300+kitchensync_la_LDFLAGS = $(KDE_RPATH) -module $(all_libraries)
    300 --- kdepim-3.5.0/kitchensync/kitchensync/main.cpp       2005-09-10 04:24:23.000000000 -0400
    301 +++ kdepim-3.5.0-new/kitchensync/kitchensync/main.cpp   2005-12-04 11:37:54.000000000 -0500
     301--- kdepim-3.5.4/kitchensync/kitchensync/main.cpp       2005-09-10 04:24:23.000000000 -0400
     302+++ kdepim-3.5.4-new/kitchensync/kitchensync/main.cpp   2006-07-30 12:26:43.000000000 -0400
    302303@@ -37,7 +37,7 @@
    303304   KCmdLineLastOption
    304305 };
    … …  
    308309 {
    309310   KSync::AboutData aboutData;
    310311 
    311 --- kdepim-3.5.0/kitchensync/libkonnector2/plugins/dummy/Makefile.am    2005-09-10 04:24:23.000000000 -0400
    312 +++ kdepim-3.5.0-new/kitchensync/libkonnector2/plugins/dummy/Makefile.am        2005-12-04 13:17:49.000000000 -0500
     312--- kdepim-3.5.4/kitchensync/libkonnector2/plugins/dummy/Makefile.am    2005-09-10 04:24:23.000000000 -0400
     313+++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/dummy/Makefile.am        2006-07-30 12:26:43.000000000 -0400
    313314@@ -1,4 +1,4 @@
    314315-lib_LTLIBRARIES = libdummykonnector.la
    315316+kde_module_LTLIBRARIES = libdummykonnector.la
    316317 
    317318 INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 -I$(top_srcdir)/libkcal $(all_includes)
    318319 
    319 --- kdepim-3.5.0/kitchensync/libkonnector2/plugins/kabc/Makefile.am     2005-09-10 04:24:23.000000000 -0400
    320 +++ kdepim-3.5.0-new/kitchensync/libkonnector2/plugins/kabc/Makefile.am 2005-12-04 13:17:53.000000000 -0500
     320--- kdepim-3.5.4/kitchensync/libkonnector2/plugins/kabc/Makefile.am     2005-09-10 04:24:23.000000000 -0400
     321+++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/kabc/Makefile.am 2006-07-30 12:26:43.000000000 -0400
    321322@@ -1,4 +1,4 @@
    322323-lib_LTLIBRARIES = libkabckonnector.la
    323324+kde_module_LTLIBRARIES = libkabckonnector.la
    324325 
    325326 INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync \
    326327            -I$(top_srcdir)/kitchensync/libkonnector2 $(all_includes)
    327 --- kdepim-3.5.0/kitchensync/libkonnector2/plugins/kcal/Makefile.am     2005-09-10 04:24:23.000000000 -0400
    328 +++ kdepim-3.5.0-new/kitchensync/libkonnector2/plugins/kcal/Makefile.am 2005-12-04 13:17:57.000000000 -0500
     328--- kdepim-3.5.4/kitchensync/libkonnector2/plugins/kcal/Makefile.am     2005-09-10 04:24:23.000000000 -0400
     329+++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/kcal/Makefile.am 2006-07-30 12:26:43.000000000 -0400
    329330@@ -1,4 +1,4 @@
    330331-lib_LTLIBRARIES = libkcalkonnector.la
    331332+kde_module_LTLIBRARIES = libkcalkonnector.la
    332333 
    333334 INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync \
    334335            -I$(top_srcdir)/kitchensync/libkonnector2 $(all_includes)
    335 --- kdepim-3.5.0/kitchensync/libkonnector2/plugins/local/Makefile.am    2005-09-10 04:24:23.000000000 -0400
    336 +++ kdepim-3.5.0-new/kitchensync/libkonnector2/plugins/local/Makefile.am        2005-12-04 13:18:01.000000000 -0500
     336--- kdepim-3.5.4/kitchensync/libkonnector2/plugins/local/Makefile.am    2005-09-10 04:24:23.000000000 -0400
     337+++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/local/Makefile.am        2006-07-30 12:26:43.000000000 -0400
    337338@@ -1,4 +1,4 @@
    338339-lib_LTLIBRARIES = liblocalkonnector.la
    339340+kde_module_LTLIBRARIES = liblocalkonnector.la
    340341 
    341342 INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 \
    342343            -I$(top_srcdir)/libkcal $(all_includes)
    343 --- kdepim-3.5.0/kitchensync/libkonnector2/plugins/qtopia/Makefile.am   2005-09-10 04:24:23.000000000 -0400
    344 +++ kdepim-3.5.0-new/kitchensync/libkonnector2/plugins/qtopia/Makefile.am       2005-12-04 13:18:09.000000000 -0500
     344--- kdepim-3.5.4/kitchensync/libkonnector2/plugins/qtopia/Makefile.am   2005-09-10 04:24:23.000000000 -0400
     345+++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/qtopia/Makefile.am       2006-07-30 12:26:43.000000000 -0400
    345346@@ -18,7 +18,7 @@
    346347 
    347348 #SUBDIRS = tests
    … …  
    351352 
    352353 INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 -I$(top_srcdir)/libkcal \
    353354  $(all_includes)
    354 --- kdepim-3.5.0/kitchensync/libkonnector2/plugins/remote/Makefile.am   2005-09-10 04:24:23.000000000 -0400
    355 +++ kdepim-3.5.0-new/kitchensync/libkonnector2/plugins/remote/Makefile.am       2005-12-04 13:18:18.000000000 -0500
     355--- kdepim-3.5.4/kitchensync/libkonnector2/plugins/remote/Makefile.am   2005-09-10 04:24:23.000000000 -0400
     356+++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/remote/Makefile.am       2006-07-30 12:26:43.000000000 -0400
    356357@@ -1,4 +1,4 @@
    357358-lib_LTLIBRARIES = libremotekonnector.la
    358359+kde_module_LTLIBRARIES = libremotekonnector.la
    359360 
    360361 INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 \
    361362            -I$(top_srcdir)/libkcal $(all_includes)
    362 --- kdepim-3.5.0/kitchensync/libkonnector2/plugins/threadedkonnector/Makefile.am        2005-09-10 04:24:23.000000000 -0400
    363 +++ kdepim-3.5.0-new/kitchensync/libkonnector2/plugins/threadedkonnector/Makefile.am    2005-12-04 13:18:25.000000000 -0500
     363--- kdepim-3.5.4/kitchensync/libkonnector2/plugins/threadedkonnector/Makefile.am        2005-09-10 04:24:23.000000000 -0400
     364+++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/threadedkonnector/Makefile.am    2006-07-30 12:26:43.000000000 -0400
    364365@@ -16,7 +16,7 @@
    365366 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    366367 #    Boston, MA 02110-1301, USA.
    … …  
    370371 
    371372 INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 -I$(top_srcdir)/libkcal $(all_includes)
    372373 
    373 --- kdepim-3.5.0/kitchensync/multisynk/Makefile.am      2005-09-10 04:24:19.000000000 -0400
    374 +++ kdepim-3.5.0-new/kitchensync/multisynk/Makefile.am  2005-12-04 11:37:54.000000000 -0500
     374--- kdepim-3.5.4/kitchensync/multisynk/Makefile.am      2005-09-10 04:24:19.000000000 -0400
     375+++ kdepim-3.5.4-new/kitchensync/multisynk/Makefile.am  2006-07-30 12:26:43.000000000 -0400
    375376@@ -7,11 +7,12 @@
    376377             $(all_includes)
    377378 
    … …  
    389390 
    390391 xdg_apps_DATA = multisynk.desktop
    391392 
    392 --- kdepim-3.5.0/kitchensync/multisynk/main.cpp 2005-09-10 04:24:19.000000000 -0400
    393 +++ kdepim-3.5.0-new/kitchensync/multisynk/main.cpp     2005-12-04 11:37:54.000000000 -0500
     393--- kdepim-3.5.4/kitchensync/multisynk/main.cpp 2005-09-10 04:24:19.000000000 -0400
     394+++ kdepim-3.5.4-new/kitchensync/multisynk/main.cpp     2006-07-30 12:26:43.000000000 -0400
    394395@@ -34,7 +34,7 @@
    395396   KCmdLineLastOption
    396397 };
    … …  
    400401 {
    401402   KAboutData *about = MainWidget::aboutData();
    402403 
    403 --- kdepim-3.5.0/kmail/Makefile.am      2005-11-08 17:33:29.000000000 -0500
    404 +++ kdepim-3.5.0-new/kmail/Makefile.am  2005-12-04 13:25:45.000000000 -0500
     404--- kdepim-3.5.4/kmail/Makefile.am      2005-11-08 17:33:29.000000000 -0500
     405+++ kdepim-3.5.4-new/kmail/Makefile.am  2006-07-30 12:26:43.000000000 -0400
    405406@@ -23,21 +23,21 @@
    406407 endif
    407408 
    … …  
    454455 
    455456 libkmailpart_la_SOURCES =  kmailpartIface.skel  kmail_part.cpp
    456457 
    457 --- kdepim-3.5.0/kmail/main.cpp 2005-09-10 04:24:02.000000000 -0400
    458 +++ kdepim-3.5.0-new/kmail/main.cpp     2005-12-04 11:37:54.000000000 -0500
     458--- kdepim-3.5.4/kmail/main.cpp 2005-09-10 04:24:02.000000000 -0400
     459+++ kdepim-3.5.4-new/kmail/main.cpp     2006-07-30 12:26:43.000000000 -0400
    459460@@ -64,7 +64,7 @@
    460461   return 0;
    461462 }
    … …  
    465466 {
    466467   // WABA: KMail is a KUniqueApplication. Unfortunately this makes debugging
    467468   // a bit harder: You should pass --nofork as commandline argument when using
    468 --- kdepim-3.5.0/kmailcvt/Makefile.am   2005-09-10 04:24:16.000000000 -0400
    469 +++ kdepim-3.5.0-new/kmailcvt/Makefile.am       2005-12-04 11:37:54.000000000 -0500
     469--- kdepim-3.5.4/kmailcvt/Makefile.am   2005-09-10 04:24:16.000000000 -0400
     470+++ kdepim-3.5.4-new/kmailcvt/Makefile.am       2006-07-30 12:26:43.000000000 -0400
    470471@@ -1,6 +1,9 @@
    471472 
    472473-bin_PROGRAMS = kmailcvt
    … …  
    501502 
    502503 KDE_ICON=AUTO
    503504 
    504 --- kdepim-3.5.0/kmailcvt/main.cpp      2005-09-10 04:24:16.000000000 -0400
    505 +++ kdepim-3.5.0-new/kmailcvt/main.cpp  2005-12-04 11:37:54.000000000 -0500
     505--- kdepim-3.5.4/kmailcvt/main.cpp      2005-09-10 04:24:16.000000000 -0400
     506+++ kdepim-3.5.4-new/kmailcvt/main.cpp  2006-07-30 12:26:43.000000000 -0400
    506507@@ -26,7 +26,7 @@
    507508   KCmdLineLastOption
    508509 };
    … …  
    512513 {
    513514   KLocale::setMainCatalogue("kmailcvt");
    514515 
    515 --- kdepim-3.5.0/kmobile/Makefile.am    2005-09-10 04:23:39.000000000 -0400
    516 +++ kdepim-3.5.0-new/kmobile/Makefile.am        2005-12-04 11:37:54.000000000 -0500
     516--- kdepim-3.5.4/kmobile/Makefile.am    2005-09-10 04:23:39.000000000 -0400
     517+++ kdepim-3.5.4-new/kmobile/Makefile.am        2006-07-30 12:26:43.000000000 -0400
    517518@@ -2,15 +2,16 @@
    518519 
    519520 SUBDIRS = . devices            # kioslave
    … …  
    535536                        pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \
    536537                        systemtray.cpp
    537538 
    538 --- kdepim-3.5.0/kmobile/main.cpp       2005-09-10 04:23:39.000000000 -0400
    539 +++ kdepim-3.5.0-new/kmobile/main.cpp   2005-12-04 11:37:54.000000000 -0500
     539--- kdepim-3.5.4/kmobile/main.cpp       2005-09-10 04:23:39.000000000 -0400
     540+++ kdepim-3.5.4-new/kmobile/main.cpp   2006-07-30 12:26:43.000000000 -0400
    540541@@ -35,7 +35,7 @@
    541542     KCmdLineLastOption
    542543 };
    … …  
    546547 {
    547548     KAboutData about("kmobile", I18N_NOOP("KMobile"), version, description,
    548549                      KAboutData::License_GPL, "(C) 2003-2005 Helge Deller", 0, 0, "deller@kde.org");
    549 --- kdepim-3.5.0/knode/Makefile.am      2005-09-10 04:24:04.000000000 -0400
    550 +++ kdepim-3.5.0-new/knode/Makefile.am  2005-12-04 13:30:43.000000000 -0500
     550--- kdepim-3.5.4/knode/Makefile.am      2005-09-10 04:24:04.000000000 -0400
     551+++ kdepim-3.5.4-new/knode/Makefile.am  2006-07-30 12:26:43.000000000 -0400
    551552@@ -10,22 +10,23 @@
    552553 lib_LTLIBRARIES = libknodecommon.la
    553554 
    … …  
    596597 
    597598 xdg_apps_DATA = KNode.desktop
    598599 
    599 --- kdepim-3.5.0/knode/main.cpp 2005-09-10 04:24:04.000000000 -0400
    600 +++ kdepim-3.5.0-new/knode/main.cpp     2005-12-04 11:37:54.000000000 -0500
     600--- kdepim-3.5.4/knode/main.cpp 2006-01-19 11:55:48.000000000 -0500
     601+++ kdepim-3.5.4-new/knode/main.cpp     2006-07-30 12:26:43.000000000 -0400
    601602@@ -25,7 +25,7 @@
    602603 #include "knode_options.h"
    603604 using KNode::AboutData;
    … …  
    607608 {
    608609   AboutData aboutData;
    609610 
    610 --- kdepim-3.5.0/knotes/Makefile.am     2005-10-10 11:02:28.000000000 -0400
    611 +++ kdepim-3.5.0-new/knotes/Makefile.am 2005-12-04 13:04:21.000000000 -0500
     611--- kdepim-3.5.4/knotes/Makefile.am     2005-10-10 11:02:28.000000000 -0400
     612+++ kdepim-3.5.4-new/knotes/Makefile.am 2006-07-30 12:26:43.000000000 -0400
    612613@@ -2,7 +2,9 @@
    613614 
    614615 SUBDIRS         = . pics icons
    … …  
    637638 
    638639 kde_module_LTLIBRARIES  = knotes_local.la
    639640 knotes_local_la_SOURCES = resourcelocal_plugin.cpp
    640 --- kdepim-3.5.0/knotes/main.cpp        2005-09-10 04:24:41.000000000 -0400
    641 +++ kdepim-3.5.0-new/knotes/main.cpp    2005-12-04 11:37:54.000000000 -0500
     641--- kdepim-3.5.4/knotes/main.cpp        2006-03-17 05:16:01.000000000 -0500
     642+++ kdepim-3.5.4-new/knotes/main.cpp    2006-07-30 12:26:43.000000000 -0400
    642643@@ -86,7 +86,7 @@
    643644     return KUniqueApplication::newInstance();
    644645 }
    … …  
    648649 {
    649650     QString version = QString::number( KNOTES_VERSION );
    650651 
    651 --- kdepim-3.5.0/kode/Makefile.am       2005-09-10 04:23:43.000000000 -0400
    652 +++ kdepim-3.5.0-new/kode/Makefile.am   2005-12-04 11:37:54.000000000 -0500
     652--- kdepim-3.5.4/kode/Makefile.am       2005-09-10 04:23:43.000000000 -0400
     653+++ kdepim-3.5.4-new/kode/Makefile.am   2006-07-30 12:26:43.000000000 -0400
    653654@@ -12,10 +12,11 @@
    654655                      -version-info 1:0:0 -no-undefined
    655656 libkode_la_LIBADD = -lkdecore
    … …  
    666667+kode_la_SOURCES = kodemain.cpp
    667668 
    668669 METASOURCES = AUTO
    669 --- kdepim-3.5.0/kode/kodemain.cpp      2005-09-10 04:23:43.000000000 -0400
    670 +++ kdepim-3.5.0-new/kode/kodemain.cpp  2005-12-04 11:37:55.000000000 -0500
     670--- kdepim-3.5.4/kode/kodemain.cpp      2005-09-10 04:23:43.000000000 -0400
     671+++ kdepim-3.5.4-new/kode/kodemain.cpp  2006-07-30 12:26:43.000000000 -0400
    671672@@ -607,7 +607,7 @@
    672673   return 0;
    673674 }
    … …  
    677678 {
    678679   KAboutData aboutData( "kode", I18N_NOOP("KDE Code Generator"), "0.1" );
    679680   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
    680 --- kdepim-3.5.0/kode/kxml_compiler/Makefile.am 2005-09-10 04:23:43.000000000 -0400
    681 +++ kdepim-3.5.0-new/kode/kxml_compiler/Makefile.am     2005-12-04 11:37:55.000000000 -0500
     681--- kdepim-3.5.4/kode/kxml_compiler/Makefile.am 2005-09-10 04:23:43.000000000 -0400
     682+++ kdepim-3.5.4-new/kode/kxml_compiler/Makefile.am     2006-07-30 12:26:43.000000000 -0400
    682683@@ -1,9 +1,11 @@
    683684 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libkdepim $(all_includes)
    684685 
    … …  
    695696+kxml_compiler_la_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp
    696697 
    697698 METASOURCES = AUTO
    698 --- kdepim-3.5.0/kode/kxml_compiler/kxml_compiler.cpp   2005-09-10 04:23:43.000000000 -0400
    699 +++ kdepim-3.5.0-new/kode/kxml_compiler/kxml_compiler.cpp       2005-12-04 11:37:55.000000000 -0500
     699--- kdepim-3.5.4/kode/kxml_compiler/kxml_compiler.cpp   2005-09-10 04:23:43.000000000 -0400
     700+++ kdepim-3.5.4-new/kode/kxml_compiler/kxml_compiler.cpp       2006-07-30 12:26:43.000000000 -0400
    700701@@ -55,7 +55,7 @@
    701702   KCmdLineLastOption
    702703 };
    … …  
    706707 {
    707708   KAboutData aboutData( "kxml_compiler", I18N_NOOP("KDE xml compiler"), "0.1",
    708709        I18N_NOOP("KDE XML Compiler") , KAboutData::License_LGPL );
    709 --- kdepim-3.5.0/konsolekalendar/Makefile.am    2005-11-08 17:33:45.000000000 -0500
    710 +++ kdepim-3.5.0-new/konsolekalendar/Makefile.am        2005-12-04 13:04:28.000000000 -0500
     710--- kdepim-3.5.4/konsolekalendar/Makefile.am    2005-11-08 17:33:45.000000000 -0500
     711+++ kdepim-3.5.4-new/konsolekalendar/Makefile.am        2006-07-30 12:26:43.000000000 -0400
    711712@@ -6,14 +6,16 @@
    712713 
    713714 METASOURCES = AUTO
    … …  
    729730 
    730731 appsdir = $(kde_appsdir)/Utilities
    731732 xdg_apps_DATA = konsolekalendar.desktop
    732 --- kdepim-3.5.0/konsolekalendar/main.cpp       2005-11-20 05:47:52.000000000 -0500
    733 +++ kdepim-3.5.0-new/konsolekalendar/main.cpp   2005-12-04 11:37:55.000000000 -0500
     733--- kdepim-3.5.4/konsolekalendar/main.cpp       2006-07-22 04:14:27.000000000 -0400
     734+++ kdepim-3.5.4-new/konsolekalendar/main.cpp   2006-07-30 12:26:43.000000000 -0400
    734735@@ -165,7 +165,7 @@
    735736   KCmdLineLastOption
    736737 };
    … …  
    740741 {
    741742   KAboutData aboutData(
    742743     progName,                        // internal program name
    743 --- kdepim-3.5.0/kontact/src/Makefile.am        2005-09-10 04:24:42.000000000 -0400
    744 +++ kdepim-3.5.0-new/kontact/src/Makefile.am    2005-12-04 13:04:39.000000000 -0500
     744--- kdepim-3.5.4/kontact/src/Makefile.am        2005-09-10 04:24:42.000000000 -0400
     745+++ kdepim-3.5.4-new/kontact/src/Makefile.am    2006-07-30 12:26:43.000000000 -0400
    745746@@ -5,23 +5,29 @@
    746747 lib_LTLIBRARIES = libkontact.la
    747748 libkontact_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
    … …  
    780781 kcm_kontact_la_LIBADD = libkontact.la $(top_builddir)/libkdepim/libkdepim.la
    781782 kcm_kontact_la_COMPILE_FIRST = prefs.h
    782783 
    783 --- kdepim-3.5.0/kontact/src/main.cpp   2005-09-10 04:24:42.000000000 -0400
    784 +++ kdepim-3.5.0-new/kontact/src/main.cpp       2005-12-04 11:37:55.000000000 -0500
    785 @@ -143,7 +143,7 @@
     784--- kdepim-3.5.4/kontact/src/main.cpp   2006-05-23 07:31:20.000000000 -0400
     785+++ kdepim-3.5.4-new/kontact/src/main.cpp       2006-07-30 12:26:43.000000000 -0400
     786@@ -127,7 +127,7 @@
    786787   return KUniqueApplication::newInstance();
    787788 }
    788789 
    … …  
    791792 {
    792793   KAboutData about( "kontact", I18N_NOOP( "Kontact" ), version, description,
    793794                     KAboutData::License_GPL, I18N_NOOP("(C) 2001-2004 The Kontact developers"), 0, "http://kontact.org" );
    794 --- kdepim-3.5.0/korganizer/Makefile.am 2005-09-10 04:24:47.000000000 -0400
    795 +++ kdepim-3.5.0-new/korganizer/Makefile.am     2005-12-04 13:04:52.000000000 -0500
     795--- kdepim-3.5.4/korganizer/Makefile.am 2006-05-22 14:11:16.000000000 -0400
     796+++ kdepim-3.5.4-new/korganizer/Makefile.am     2006-07-30 12:26:43.000000000 -0400
    796797@@ -12,18 +12,19 @@
    797798   -I$(top_builddir) \
    798799   $(all_includes)
    … …  
    828829        koagendaview.cpp koagenda.cpp koagendaitem.cpp \
    829830        datenavigator.cpp kdatenavigator.cpp datenavigatorcontainer.cpp \
    830831        datechecker.cpp \
    831 --- kdepim-3.5.0/korganizer/korgac/Makefile.am  2005-09-10 04:24:44.000000000 -0400
    832 +++ kdepim-3.5.0-new/korganizer/korgac/Makefile.am      2005-12-04 11:37:55.000000000 -0500
     832--- kdepim-3.5.4/korganizer/korgac/Makefile.am  2005-09-10 04:24:44.000000000 -0400
     833+++ kdepim-3.5.4-new/korganizer/korgac/Makefile.am      2006-07-30 12:26:43.000000000 -0400
    833834@@ -1,11 +1,13 @@
    834835 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/korganizer $(all_includes)
    835836 
    … …  
    859860 
    860861 noinst_HEADERS = alarmclientiface.h alarmdialog.h \
    861862                  alarmdockwindow.h koalarmclient.h
    862 --- kdepim-3.5.0/korganizer/korgac/korgacmain.cpp       2005-09-10 04:24:44.000000000 -0400
    863 +++ kdepim-3.5.0-new/korganizer/korgac/korgacmain.cpp   2005-12-04 11:37:55.000000000 -0500
    864 @@ -58,7 +58,7 @@
     863--- kdepim-3.5.4/korganizer/korgac/korgacmain.cpp       2006-01-19 11:56:25.000000000 -0500
     864+++ kdepim-3.5.4-new/korganizer/korgac/korgacmain.cpp   2006-07-30 12:26:43.000000000 -0400
     865@@ -59,7 +59,7 @@
    865866   { 0, 0, 0 }
    866867 };
    867868 
    … …  
    870871 {
    871872   KLocale::setMainCatalogue( "korganizer" );
    872873   KAboutData aboutData( "korgac", I18N_NOOP("KOrganizer Reminder Daemon"),
    873 --- kdepim-3.5.0/korganizer/korgplugins.cpp     2005-09-10 04:24:47.000000000 -0400
    874 +++ kdepim-3.5.0-new/korganizer/korgplugins.cpp 2005-12-04 11:37:55.000000000 -0500
     874--- kdepim-3.5.4/korganizer/korgplugins.cpp     2005-09-10 04:24:47.000000000 -0400
     875+++ kdepim-3.5.4-new/korganizer/korgplugins.cpp 2006-07-30 12:26:43.000000000 -0400
    875876@@ -32,7 +32,7 @@
    876877 
    877878 #include "kocore.h"
    … …  
    881882 {
    882883   KAboutData aboutData("korgplugins",I18N_NOOP("KOrgPlugins"),"0.1");
    883884   KCmdLineArgs::init(argc,argv,&aboutData);
    884 --- kdepim-3.5.0/korganizer/main.cpp    2005-09-10 04:24:47.000000000 -0400
    885 +++ kdepim-3.5.0-new/korganizer/main.cpp        2005-12-04 11:37:55.000000000 -0500
     885--- kdepim-3.5.4/korganizer/main.cpp    2005-09-10 04:24:47.000000000 -0400
     886+++ kdepim-3.5.4-new/korganizer/main.cpp        2006-07-30 12:26:43.000000000 -0400
    886887@@ -35,7 +35,7 @@
    887888 #include "korganizer.h"
    888889 #include "korganizer_options.h"
    … …  
    892893 {
    893894   KOrg::AboutData aboutData;
    894895 
    895 --- kdepim-3.5.0/korganizer/timezone.cpp        2005-09-10 04:24:47.000000000 -0400
    896 +++ kdepim-3.5.0-new/korganizer/timezone.cpp    2005-12-04 11:37:55.000000000 -0500
     896--- kdepim-3.5.4/korganizer/timezone.cpp        2005-09-10 04:24:47.000000000 -0400
     897+++ kdepim-3.5.4-new/korganizer/timezone.cpp    2006-07-30 12:26:43.000000000 -0400
    897898@@ -34,7 +34,7 @@
    898899 
    899900 #include "koprefs.h"
    … …  
    903904 {
    904905   KAboutData aboutData("timezone",I18N_NOOP("KOrganizer Timezone Test"),"0.1");
    905906   KCmdLineArgs::init(argc,argv,&aboutData);
    906 --- kdepim-3.5.0/korn/Makefile.am       2005-11-08 17:33:32.000000000 -0500
    907 +++ kdepim-3.5.0-new/korn/Makefile.am   2005-12-04 11:37:55.000000000 -0500
     907--- kdepim-3.5.4/korn/Makefile.am       2005-11-08 17:33:32.000000000 -0500
     908+++ kdepim-3.5.4-new/korn/Makefile.am   2006-07-30 12:26:44.000000000 -0400
    908909@@ -6,11 +6,15 @@
    909910 
    910911 METASOURCES = AUTO
    … …  
    924925   accountmanager.cpp \
    925926   account_input.cpp \
    926927   boxcontainer.cpp \
    927 --- kdepim-3.5.0/korn/main.cpp  2005-11-08 17:33:32.000000000 -0500
    928 +++ kdepim-3.5.0-new/korn/main.cpp      2005-12-04 11:37:55.000000000 -0500
     928--- kdepim-3.5.4/korn/main.cpp  2006-07-22 04:14:20.000000000 -0400
     929+++ kdepim-3.5.4-new/korn/main.cpp      2006-07-30 12:26:44.000000000 -0400
    929930@@ -14,7 +14,7 @@
    930931 static const char version[] = "0.4";
    931932 
    … …  
    935936 {
    936937        KAboutData aboutData(argv[0], I18N_NOOP("Korn"),
    937938                version, description, KAboutData::License_GPL,
    938 --- kdepim-3.5.0/kpilot/conduits/docconduit/Makefile.am 2005-11-08 17:33:38.000000000 -0500
    939 +++ kdepim-3.5.0-new/kpilot/conduits/docconduit/Makefile.am     2005-12-04 11:37:55.000000000 -0500
     939--- kdepim-3.5.4/kpilot/conduits/docconduit/Makefile.am 2005-11-08 17:33:38.000000000 -0500
     940+++ kdepim-3.5.4-new/kpilot/conduits/docconduit/Makefile.am     2006-07-30 12:26:44.000000000 -0400
    940941@@ -14,7 +14,9 @@
    941942 
    942943 noinst_LTLIBRARIES = libpalmdoc_shared.la
    … …  
    961962 
    962963 xdg_apps_DATA = kpalmdoc.desktop
    963964 servicetypedir = $(kde_servicetypesdir)
    964 --- kdepim-3.5.0/kpilot/conduits/docconduit/kpalmdoc.cpp        2005-09-10 04:24:37.000000000 -0400
    965 +++ kdepim-3.5.0-new/kpilot/conduits/docconduit/kpalmdoc.cpp    2005-12-04 11:37:55.000000000 -0500
     965--- kdepim-3.5.4/kpilot/conduits/docconduit/kpalmdoc.cpp        2005-09-10 04:24:37.000000000 -0400
     966+++ kdepim-3.5.4-new/kpilot/conduits/docconduit/kpalmdoc.cpp    2006-07-30 12:26:44.000000000 -0400
    966967@@ -36,7 +36,7 @@
    967968 
    968969 
    … …  
    972973 {
    973974 
    974975        KAboutData about("converter", I18N_NOOP("KPalmDOC"), "-0.0.1",
    975 --- kdepim-3.5.0/kpilot/conduits/malconduit/mal-conduit.cc      2005-09-10 04:24:37.000000000 -0400
    976 +++ kdepim-3.5.0-new/kpilot/conduits/malconduit/mal-conduit.cc  2005-12-04 11:37:55.000000000 -0500
     976--- kdepim-3.5.4/kpilot/conduits/malconduit/mal-conduit.cc      2005-09-10 04:24:37.000000000 -0400
     977+++ kdepim-3.5.4-new/kpilot/conduits/malconduit/mal-conduit.cc  2006-07-30 12:26:44.000000000 -0400
    977978@@ -34,6 +34,7 @@
    978979 
    979980 #include "options.h"
    … …  
    982983 #include <qregexp.h>
    983984 #include <kconfig.h>
    984985 #include <kdebug.h>
    985 --- kdepim-3.5.0/kpilot/kpilot/Makefile.am      2005-09-10 04:24:40.000000000 -0400
    986 +++ kdepim-3.5.0-new/kpilot/kpilot/Makefile.am  2005-12-04 13:05:06.000000000 -0500
     986--- kdepim-3.5.4/kpilot/kpilot/Makefile.am      2005-09-10 04:24:40.000000000 -0400
     987+++ kdepim-3.5.4-new/kpilot/kpilot/Makefile.am  2006-07-30 12:26:44.000000000 -0400
    987988@@ -9,9 +9,10 @@
    988989 SUBDIRS = Icons
    989990 
    … …  
    10551056        ../lib/libkpilot.la libconfiguration.la
    10561057 
    10571058 xdg_apps_DATA = kpilot.desktop  kpilotdaemon.desktop
    1058 --- kdepim-3.5.0/kpilot/kpilot/kpilot.cc        2005-09-10 04:24:39.000000000 -0400
    1059 +++ kdepim-3.5.0-new/kpilot/kpilot/kpilot.cc    2005-12-04 11:37:55.000000000 -0500
     1059--- kdepim-3.5.4/kpilot/kpilot/kpilot.cc        2005-09-10 04:24:39.000000000 -0400
     1060+++ kdepim-3.5.4-new/kpilot/kpilot/kpilot.cc    2006-07-30 12:26:44.000000000 -0400
    10601061@@ -1102,7 +1102,7 @@
    10611062 
    10621063 
    … …  
    10661067 {
    10671068        FUNCTIONSETUP;
    10681069 
    1069 --- kdepim-3.5.0/kpilot/kpilot/pilotDaemon.cc   2005-09-10 04:24:39.000000000 -0400
    1070 +++ kdepim-3.5.0-new/kpilot/kpilot/pilotDaemon.cc       2005-12-04 11:37:55.000000000 -0500
     1070--- kdepim-3.5.4/kpilot/kpilot/pilotDaemon.cc   2005-09-10 04:24:39.000000000 -0400
     1071+++ kdepim-3.5.4-new/kpilot/kpilot/pilotDaemon.cc       2006-07-30 12:26:44.000000000 -0400
    10711072@@ -1265,7 +1265,7 @@
    10721073 } ;
    10731074 
    … …  
    10771078 {
    10781079        FUNCTIONSETUP;
    10791080 
    1080 --- kdepim-3.5.0/kresources/featureplan/benchmarkfeaturelist.cpp        2005-09-10 04:23:46.000000000 -0400
    1081 +++ kdepim-3.5.0-new/kresources/featureplan/benchmarkfeaturelist.cpp    2005-12-04 11:37:55.000000000 -0500
     1081--- kdepim-3.5.4/kresources/featureplan/benchmarkfeaturelist.cpp        2005-09-10 04:23:46.000000000 -0400
     1082+++ kdepim-3.5.4-new/kresources/featureplan/benchmarkfeaturelist.cpp    2006-07-30 12:26:44.000000000 -0400
    10821083@@ -67,7 +67,7 @@
    10831084   }
    10841085 }
    … …  
    10881089 {
    10891090   KAboutData aboutData( "benchmarkfeaturelist",
    10901091                         "Benchmark for feature list XML parser",
    1091 --- kdepim-3.5.0/kresources/featureplan/dumpfeaturelist.cpp     2005-09-10 04:23:46.000000000 -0400
    1092 +++ kdepim-3.5.0-new/kresources/featureplan/dumpfeaturelist.cpp 2005-12-04 11:37:55.000000000 -0500
     1092--- kdepim-3.5.4/kresources/featureplan/dumpfeaturelist.cpp     2006-05-22 14:10:46.000000000 -0400
     1093+++ kdepim-3.5.4-new/kresources/featureplan/dumpfeaturelist.cpp 2006-07-30 12:26:44.000000000 -0400
    10931094@@ -67,7 +67,7 @@
    10941095   }
    10951096 }
    … …  
    10991100 {
    11001101   KAboutData aboutData( "dumpfeaturelist", "Dump XML feature list to stdout",
    11011102                         "0.1" );
    1102 --- kdepim-3.5.0/kresources/groupwise/soap/soapdebug.cpp        2005-09-10 04:23:46.000000000 -0400
    1103 +++ kdepim-3.5.0-new/kresources/groupwise/soap/soapdebug.cpp    2005-12-04 11:37:55.000000000 -0500
     1103--- kdepim-3.5.4/kresources/groupwise/soap/soapdebug.cpp        2005-09-10 04:23:46.000000000 -0400
     1104+++ kdepim-3.5.4-new/kresources/groupwise/soap/soapdebug.cpp    2006-07-30 12:26:44.000000000 -0400
    11041105@@ -44,7 +44,7 @@
    11051106   KCmdLineLastOption
    11061107 };
    … …  
    11101111 {
    11111112   KAboutData aboutData( "soapdebug", I18N_NOOP("Groupwise Soap Debug"), "0.1" );
    11121113   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
    1113 --- kdepim-3.5.0/ksync/src/Makefile.am  2005-09-10 04:23:48.000000000 -0400
    1114 +++ kdepim-3.5.0-new/ksync/src/Makefile.am      2005-12-04 11:37:55.000000000 -0500
     1114--- kdepim-3.5.4/ksync/src/Makefile.am  2005-09-10 04:23:48.000000000 -0400
     1115+++ kdepim-3.5.4-new/ksync/src/Makefile.am      2006-07-30 12:26:44.000000000 -0400
    11151116@@ -1,7 +1,10 @@
    11161117-bin_PROGRAMS = ksync
    11171118-ksync_SOURCES = ksyncview.cpp ksync.cpp main.cpp
    … …  
    11271128 
    11281129 EXTRA_DIST = main.cpp ksync.cpp ksync.h ksyncdoc.cpp ksyncdoc.h ksyncview.cpp ksyncview.h ksyncui.rc ksync.desktop lo32-app-ksync.png lo16-app-ksync.png
    11291130 
    1130 --- kdepim-3.5.0/ksync/src/main.cpp     2005-09-10 04:23:48.000000000 -0400
    1131 +++ kdepim-3.5.0-new/ksync/src/main.cpp 2005-12-04 11:37:56.000000000 -0500
     1131--- kdepim-3.5.4/ksync/src/main.cpp     2005-09-10 04:23:48.000000000 -0400
     1132+++ kdepim-3.5.4-new/ksync/src/main.cpp 2006-07-30 12:26:44.000000000 -0400
    11321133@@ -37,7 +37,7 @@
    11331134   // INSERT YOUR COMMANDLINE OPTIONS HERE
    11341135 };
    … …  
    11381139 {
    11391140 
    11401141        KAboutData aboutData( "ksync", I18N_NOOP("KSync"),
    1141 --- kdepim-3.5.0/ktnef/gui/Makefile.am  2005-09-10 04:24:43.000000000 -0400
    1142 +++ kdepim-3.5.0-new/ktnef/gui/Makefile.am      2005-12-04 11:37:56.000000000 -0500
     1142--- kdepim-3.5.4/ktnef/gui/Makefile.am  2005-09-10 04:24:43.000000000 -0400
     1143+++ kdepim-3.5.4-new/ktnef/gui/Makefile.am      2006-07-30 12:26:44.000000000 -0400
    11431144@@ -2,14 +2,16 @@
    11441145 
    11451146 SUBDIRS = pics
    … …  
    11631164 
    11641165 noinst_HEADERS = ktnefmain.h ktnefview.h attachpropertydialog.h \
    11651166                  qwmf.h wmfstruct.h metafuncs.h
    1166 --- kdepim-3.5.0/ktnef/gui/main.cpp     2005-09-10 04:24:43.000000000 -0400
    1167 +++ kdepim-3.5.0-new/ktnef/gui/main.cpp 2005-12-04 11:37:56.000000000 -0500
     1167--- kdepim-3.5.4/ktnef/gui/main.cpp     2005-09-10 04:24:43.000000000 -0400
     1168+++ kdepim-3.5.4-new/ktnef/gui/main.cpp 2006-07-30 12:26:44.000000000 -0400
    11681169@@ -33,7 +33,7 @@
    11691170   // INSERT YOUR COMMANDLINE OPTIONS HERE
    11701171 };
    … …  
    11741175 {
    11751176 
    11761177   KAboutData aboutData( "ktnef", I18N_NOOP("KTnef"),
    1177 --- kdepim-3.5.0/libkcal/convertqtopia.cpp      2005-09-10 04:24:36.000000000 -0400
    1178 +++ kdepim-3.5.0-new/libkcal/convertqtopia.cpp  2005-12-04 11:37:56.000000000 -0500
     1178--- kdepim-3.5.4/libkcal/convertqtopia.cpp      2005-09-10 04:24:36.000000000 -0400
     1179+++ kdepim-3.5.4-new/libkcal/convertqtopia.cpp  2006-07-30 12:26:44.000000000 -0400
    11791180@@ -48,7 +48,7 @@
    11801181   KCmdLineLastOption
    11811182 };
    … …  
    11851186 {
    11861187   KAboutData aboutData("convertqtopia",I18N_NOOP("Qtopia calendar file converter"),"0.1");
    11871188   aboutData.addAuthor("Cornelius Schumacher", 0, "schumacher@kde.org");
    1188 --- kdepim-3.5.0/libkcal/versit/vcc.c   2005-09-10 04:24:36.000000000 -0400
    1189 +++ kdepim-3.5.0-new/libkcal/versit/vcc.c       2005-12-04 11:37:56.000000000 -0500
     1189--- kdepim-3.5.4/libkcal/versit/vcc.c   2005-09-10 04:24:36.000000000 -0400
     1190+++ kdepim-3.5.4-new/libkcal/versit/vcc.c       2006-07-30 12:26:44.000000000 -0400
    11901191@@ -198,9 +198,6 @@
    11911192 #endif
    11921193 
    … …  
    11971198 #include <stdio.h>
    11981199 #include <stdlib.h>
    11991200 #include <ctype.h>
    1200 --- kdepim-3.5.0/libkdepim/cfgc/autoexample.cpp 2005-09-10 04:24:24.000000000 -0400
    1201 +++ kdepim-3.5.0-new/libkdepim/cfgc/autoexample.cpp     2005-12-04 11:37:56.000000000 -0500
     1201--- kdepim-3.5.4/libkdepim/cfgc/autoexample.cpp 2005-09-10 04:24:24.000000000 -0400
     1202+++ kdepim-3.5.4-new/libkdepim/cfgc/autoexample.cpp     2006-07-30 12:26:44.000000000 -0400
    12021203@@ -36,7 +36,7 @@
    12031204 
    12041205 #include <qlabel.h>
    … …  
    12081209 {
    12091210   KAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" );
    12101211   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
    1211 --- kdepim-3.5.0/libkdepim/cfgc/example.cpp     2005-09-10 04:24:24.000000000 -0400
    1212 +++ kdepim-3.5.0-new/libkdepim/cfgc/example.cpp 2005-12-04 11:37:56.000000000 -0500
     1212--- kdepim-3.5.4/libkdepim/cfgc/example.cpp     2005-09-10 04:24:24.000000000 -0400
     1213+++ kdepim-3.5.4-new/libkdepim/cfgc/example.cpp 2006-07-30 12:26:44.000000000 -0400
    12131214@@ -32,7 +32,7 @@
    12141215 
    12151216 #include <libkdepim/kprefsdialog.h>
    … …  
    12191220 {
    12201221   KAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" );
    12211222   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
    1222 --- kdepim-3.5.0/libkholidays/Makefile.am       2005-09-10 04:24:19.000000000 -0400
    1223 +++ kdepim-3.5.0-new/libkholidays/Makefile.am   2005-12-04 11:37:56.000000000 -0500
     1223--- kdepim-3.5.4/libkholidays/Makefile.am       2006-07-22 04:14:21.000000000 -0400
     1224+++ kdepim-3.5.4-new/libkholidays/Makefile.am   2006-07-30 12:26:44.000000000 -0400
    12241225@@ -7,7 +7,7 @@
    12251226 lib_LTLIBRARIES = libkholidays.la
    12261227 
    … …  
    12301231 libkholidays_la_SOURCES = kholidays.cpp scanholiday.c parseholiday.h parseholiday.c lunarphase.cpp
    12311232 
    12321233 #the lex/flex and yacc/bison files are in CVS and NOT generated
    1233 --- kdepim-3.5.0/libkholidays/parseholiday.c    2005-09-10 04:24:19.000000000 -0400
    1234 +++ kdepim-3.5.0-new/libkholidays/parseholiday.c        2005-12-04 11:37:56.000000000 -0500
    1235 @@ -106,7 +106,7 @@
     1234--- kdepim-3.5.4/libkholidays/parseholiday.c    2006-07-22 04:14:21.000000000 -0400
     1235+++ kdepim-3.5.4-new/libkholidays/parseholiday.c        2006-07-30 12:27:25.000000000 -0400
     1236@@ -111,8 +111,8 @@
     1237                         int year, int off, int length);
    12361238 /*** Variables and structures ***/
    12371239 static int      m, d, y;
    1238  int              kcallineno;           /* current line # being parsed */
     1240-int              kcallineno;           /* current line # being parsed */
    12391241-FILE            *kcalin;                  /* file currently being processed */
     1242+extern int              kcallineno;            /* current line # being parsed */
    12401243+extern FILE            *kcalin;                  /* file currently being processed */
    12411244 int             yacc_small;            /* small string or on its own line? */
    12421245 int             yacc_stringcolor;      /* color of holiday name text, 1..8 */
    12431246 char           *yacc_string;           /* holiday name text */
    1244 --- kdepim-3.5.0/mimelib/dw_date.cpp    2005-09-10 04:24:49.000000000 -0400
    1245 +++ kdepim-3.5.0-new/mimelib/dw_date.cpp        2005-12-04 11:37:56.000000000 -0500
    1246 @@ -673,7 +673,7 @@
    1247      "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
     1247--- kdepim-3.5.4/libkholidays/scanholiday.c     2006-07-22 04:14:21.000000000 -0400
     1248+++ kdepim-3.5.4-new/libkholidays/scanholiday.c 2006-07-30 12:27:35.000000000 -0400
     1249@@ -347,7 +347,7 @@
     1250 
     1251 extern int kcallineno;
     1252 
     1253-int kcallineno = 1;
     1254+kcallineno = 1;
     1255 
     1256 extern char *kcaltext;
     1257 #define yytext_ptr kcaltext
     1258--- kdepim-3.5.4/mimelib/dw_date.cpp    2006-01-19 11:56:38.000000000 -0500
     1259+++ kdepim-3.5.4-new/mimelib/dw_date.cpp        2006-07-30 12:26:44.000000000 -0400
     1260@@ -658,7 +658,7 @@
     1261     ""
    12481262 };
    12491263 
    12501264-int main()
    … …  
    12521266 {
    12531267     struct tm *ptms, tms1, tms2;
    12541268     time_t tt;
    1255 --- kdepim-3.5.0/mimelib/uuencode.cpp   2005-09-10 04:24:49.000000000 -0400
    1256 +++ kdepim-3.5.0-new/mimelib/uuencode.cpp       2005-12-04 11:37:56.000000000 -0500
     1269--- kdepim-3.5.4/mimelib/uuencode.cpp   2005-09-10 04:24:49.000000000 -0400
     1270+++ kdepim-3.5.4-new/mimelib/uuencode.cpp       2006-07-30 12:26:44.000000000 -0400
    12571271@@ -431,7 +431,7 @@
    12581272 
    12591273 // Test harness for DwUudecode
    … …  
    12631277 {
    12641278        srand(time(0));
    12651279        DwString binStr;
    1266 --- kdepim-3.5.0/networkstatus/Makefile.am      2005-09-10 04:24:02.000000000 -0400
    1267 +++ kdepim-3.5.0-new/networkstatus/Makefile.am  2005-12-04 13:05:15.000000000 -0500
     1280--- kdepim-3.5.4/networkstatus/Makefile.am      2005-09-10 04:24:02.000000000 -0400
     1281+++ kdepim-3.5.4-new/networkstatus/Makefile.am  2006-07-30 12:26:44.000000000 -0400
    12681282@@ -19,7 +19,7 @@
    12691283        clientiface.skel serviceiface.skel network.cpp
    12701284 #kclientiface.skel serviceiface.skel
    … …  
    12901304 
    12911305-networkstatustestservice_SOURCES = testservice.cpp provideriface.skel serviceiface.stub
    12921306+networkstatustestservice_la_SOURCES = testservice.cpp provideriface.skel serviceiface.stub
    1293 --- kdepim-3.5.0/networkstatus/testservice.cpp  2005-09-10 04:24:02.000000000 -0400
    1294 +++ kdepim-3.5.0-new/networkstatus/testservice.cpp      2005-12-04 11:37:56.000000000 -0500
     1307--- kdepim-3.5.4/networkstatus/testservice.cpp  2005-09-10 04:24:02.000000000 -0400
     1308+++ kdepim-3.5.4-new/networkstatus/testservice.cpp      2006-07-30 12:26:44.000000000 -0400
    12951309@@ -90,7 +90,7 @@
    12961310        m_service->setNetworkStatus( "test_net", (int)m_status );
    12971311 }
    … …  
    13011315 {
    13021316        KApplication app(argc, argv, "testdcop");
    13031317        TestService * test = new TestService;
    1304 --- kdepim-3.5.0/wizards/Makefile.am    2005-09-10 04:23:44.000000000 -0400
    1305 +++ kdepim-3.5.0-new/wizards/Makefile.am        2005-12-04 11:37:56.000000000 -0500
     1318--- kdepim-3.5.4/wizards/Makefile.am    2005-09-10 04:23:44.000000000 -0400
     1319+++ kdepim-3.5.4-new/wizards/Makefile.am        2006-07-30 12:26:44.000000000 -0400
    13061320@@ -12,7 +12,7 @@
    13071321 bin_PROGRAMS = groupwarewizard egroupwarewizard sloxwizard kolabwizard \
    13081322                groupwisewizard exchangewizard

  • kdepim3/Portfile

     
    11# $Id$
    22
    3 #Synced with Fink, Version 3.5.1-1024
     3#Synced with Fink, Version 3.5.4-1021
    44
    55PortSystem 1.0
    66name            kdepim3
    7 version         3.5.1
    8 revision        4
    9 set kdeadmin    kde-admindir-3.5.1
     7version         3.5.4
     8set kdeadmin    kde-admindir-252
    109categories      kde
    1110maintainers     ben@macports.org takanori@macports.org
    1211description     KDE personal information management tools. \
    1312                NB No KDE sound support.
    1413platforms       darwin
    15 master_sites    opendarwin::kde351 \
     14master_sites    opendarwin::kde354 \
    1615                opendarwin::admin
    1716#               kde:stable/${version}/src
    1817#               http://ranger.befunk.com/fink/:admin
    19 extract.suffix  .tar.bz2
    2018use_bzip2       yes
    2119distname        kdepim-${version}
    22 distfiles       ${distname}.tar.bz2:kde351 \
     20distfiles       ${distname}.tar.bz2:kde354 \
    2321                ${kdeadmin}.tar.bz2:admin
    2422depends_build   port:autoconf \
    25                 port:automake
    26 depends_lib     port:kdebase3 \
    27                 port:cyrus-sasl2 \
    28                 port:gpgme \
     23                port:unsermake
     24depends_lib     port:gpgme \
    2925                port:kdeaccessibility3 \
     26                port:kdebase3 \
    3027                port:libgpg-error
    3128#               port:gnokii \  isn't detected :-(
     29#               port:gtk1
     30#               port:pilot-link
    3231
    33 checksums       ${distname}.tar.bz2 md5 8e87c9cbe1f0c0f983f94d804a5bc8f9 \
    34                 ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
     32checksums       ${distname}.tar.bz2 md5 4a01ceaeb6067d03003edb77b104f559 \
     33                ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
    3534
    36 extract.only ${distname}.tar.bz2
    37 post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
     35extract.only    ${distname}.tar.bz2
     36post-extract    { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
    3837
    3938patchfiles      kdepim3.patch
    4039patch           {
    4140                cd ${worksrcpath}
    4241                foreach file $patchfiles {
    43                     system "sed -e 's,@FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
     42                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
    4443                }
     44                system "perl -pi -e 's,#include <malloc.h>,,g' libkcal/versit/vcc*"
     45                system "perl -pi -e 's/-Xlinker -framework -Xlinker (\\S*)/-Wl,-framework,\$1/g; s/-framework (\\S*)/-Wl,-framework,\$1/g;' admin/*"
    4546}
    46 post-patch      {
    47                 reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
    48                 reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
     47post-patch      {
     48                reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
    4949                reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
    50                 reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
    51                 foreach file [glob ${worksrcpath}/admin/*] {
    52                     reinplace "s|-O2|-Os|g" $file
    53                     reinplace "s|doc/HTML|doc/kde|g" $file
    54                     reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
    55                 }
    5650                foreach file {CompileScript.sh InstallScript.sh} {
    57                     file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
     51                    file copy ${filespath}/${file} ${worksrcpath}
    5852                    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
    5953                    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
    6054                    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
    … …  
    6660                }
    6761}
    6862
    69 configure.args  --disable-indexlib --with-distribution='DarwinPorts/Mac OS X' --without-gnokii --without-arts
     63configure.args  --disable-indexlib --with-distribution='MacPorts/Mac OS X' --without-gnokii --without-arts
    7064
    7165configure       {}
    7266build           { system "cd ${worksrcpath} && ./CompileScript.sh" }
    7367destroot        { system "cd ${worksrcpath} && ./InstallScript.sh" }
    7468
    75 post-destroot   {
     69post-destroot   {
    7670                xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
    77                 xinstall -m 644 -W ${worksrcpath} MAINTAINERS README README.Kolab README.libical ${destroot}${prefix}/share/doc/${name}
     71                xinstall -m 644 -W ${worksrcpath} README README.Kolab README.libical ${destroot}${prefix}/share/doc/${name}
    7872}
    79 
    80 platform darwin 6 {
    81         depends_lib-append      lib:libdl:dlcompat
    82 }

  • kdesdk3/files/InstallScript.sh

     
    11#!/bin/sh -e
    22
    3         export PREFIX="%p"
     3        export PREFIX="%p" USE_UNSERMAKE=1
    44        . ./environment-helper.sh
    55
    6 #darwinports
    7         export UNSERMAKE="no"
     6        ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
    87
    9         ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
    10 
    118        mkdir -p %i/share/doc/installed-packages
    129        touch %i/share/doc/installed-packages/%N
    1310        touch %i/share/doc/installed-packages/%N-base

  • kdesdk3/files/CompileScript.sh

     
    11#!/bin/sh -e
    22
    3         export HOME=/tmp
    4         export PREFIX="%p"
    5         #fink
    6         #export LEX="%p/lib/flex/bin/flex"
    7         #darwinports
    8         export LEX="%p/bin/flex"
     3        export PREFIX="%p" USE_UNSERMAKE=1
    94        . ./environment-helper.sh
    10         export lt_cv_sys_max_cmd_len=65536
    115
    12 #darwinports
    13         export UNSERMAKE="no"
    14 
    15         export CC=gcc CXX=g++
    16 
    176        ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
    187        ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
    198
    … …  
    2211        find . -name \*.ll -exec touch {} \;
    2312
    2413        #fink
    25         #./build-helper.sh make      %N %v %r make all LIB_DBIV=-ldb-4.2 all_libraries="$ALL_LIBRARIES"
     14        #./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS LIB_DBIV=-ldb-4.2
    2615        #darwinports
    27         ./build-helper.sh make      %N %v %r make all LIB_DBIV=-ldb-4.3 all_libraries="$ALL_LIBRARIES"
     16        ./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS LIB_DBIV=-ldb-4.3

  • kdesdk3/files/kdesdk3.patch

     
    1 --- kdesdk-3.5.0/kapptemplate/kapp/app-Makefile.am      2005-09-10 04:20:59.000000000 -0400
    2 +++ kdesdk-3.5.0-new/kapptemplate/kapp/app-Makefile.am  2005-12-11 00:47:09.000000000 -0500
     1
     2--- kdesdk-3.5.4/kapptemplate/kapp/app-Makefile.am      2005-09-10 04:20:59.000000000 -0400
     3+++ kdesdk-3.5.4-new/kapptemplate/kapp/app-Makefile.am  2006-08-01 14:55:54.000000000 -0400
    34@@ -8,28 +8,30 @@
    45 
    56 # this is the program that gets installed.  it's name is used for all
    … …  
    3839 
    3940 # let automoc handle all of the meta source files (moc)
    4041 METASOURCES = AUTO
    41 --- kdesdk-3.5.0/kapptemplate/kapp/app_client.cpp       2005-09-10 04:20:59.000000000 -0400
    42 +++ kdesdk-3.5.0-new/kapptemplate/kapp/app_client.cpp   2005-12-11 00:47:09.000000000 -0500
     42--- kdesdk-3.5.4/kapptemplate/kapp/app_client.cpp       2005-09-10 04:20:59.000000000 -0400
     43+++ kdesdk-3.5.4-new/kapptemplate/kapp/app_client.cpp   2006-08-01 14:55:54.000000000 -0400
    4344@@ -5,7 +5,7 @@
    4445 #include <qdatastream.h>
    4546 #include <qstring.h>
    … …  
    4950 {
    5051     KApplication app(argc, argv, "${APP_NAME_LC}_client", false);
    5152 
    52 --- kdesdk-3.5.0/kapptemplate/kapp/main.cpp     2005-09-10 04:20:59.000000000 -0400
    53 +++ kdesdk-3.5.0-new/kapptemplate/kapp/main.cpp 2005-12-11 00:47:09.000000000 -0500
     53--- kdesdk-3.5.4/kapptemplate/kapp/main.cpp     2005-09-10 04:20:59.000000000 -0400
     54+++ kdesdk-3.5.4-new/kapptemplate/kapp/main.cpp 2006-08-01 14:55:54.000000000 -0400
    5455@@ -18,7 +18,7 @@
    5556     KCmdLineLastOption
    5657 };
    … …  
    6061 {
    6162     KAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, KAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}");
    6263     about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" );
    63 --- kdesdk-3.5.0/kapptemplate/kpartapp/main.cpp 2005-09-10 04:20:59.000000000 -0400
    64 +++ kdesdk-3.5.0-new/kapptemplate/kpartapp/main.cpp     2005-12-11 00:47:09.000000000 -0500
     64--- kdesdk-3.5.4/kapptemplate/kpartapp/main.cpp 2005-09-10 04:20:59.000000000 -0400
     65+++ kdesdk-3.5.4-new/kapptemplate/kpartapp/main.cpp     2006-08-01 14:55:54.000000000 -0400
    6566@@ -17,7 +17,7 @@
    6667     KCmdLineLastOption
    6768 };
    … …  
    7172 {
    7273     KAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, KAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}");
    7374     about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" );
    74 --- kdesdk-3.5.0/kbabel/catalogmanager/Makefile.am      2005-10-10 10:58:16.000000000 -0400
    75 +++ kdesdk-3.5.0-new/kbabel/catalogmanager/Makefile.am  2005-12-11 00:47:09.000000000 -0500
     75--- kdesdk-3.5.4/kbabel/catalogmanager/Makefile.am      2005-10-10 10:58:16.000000000 -0400
     76+++ kdesdk-3.5.4-new/kbabel/catalogmanager/Makefile.am  2006-08-01 14:55:54.000000000 -0400
    7677@@ -7,7 +7,11 @@
    7778 # this is the program that gets installed. Its name is used for all
    7879 # of the other Makefile.am variables
    … …  
    101102 
    102103 # these are the headers for your project
    103104 noinst_HEADERS   = catalogmanageriface.h catalogmanager.h \
    104 --- kdesdk-3.5.0/kbabel/catalogmanager/main.cpp 2005-10-10 10:58:16.000000000 -0400
    105 +++ kdesdk-3.5.0-new/kbabel/catalogmanager/main.cpp     2005-12-11 00:47:09.000000000 -0500
     105--- kdesdk-3.5.4/kbabel/catalogmanager/main.cpp 2006-07-22 04:11:51.000000000 -0400
     106+++ kdesdk-3.5.4-new/kbabel/catalogmanager/main.cpp     2006-08-01 14:55:54.000000000 -0400
    106107@@ -178,7 +178,7 @@
    107108 };
    108109 
    … …  
    112113 {
    113114     KLocale::setMainCatalogue("kbabel");
    114115     KAboutData about("catalogmanager",I18N_NOOP("KBabel - Catalog Manager"),VERSION,
    115 --- kdesdk-3.5.0/kbabel/commonui/Makefile.am    2005-09-10 04:20:53.000000000 -0400
    116 +++ kdesdk-3.5.0-new/kbabel/commonui/Makefile.am        2005-12-11 00:47:09.000000000 -0500
     116--- kdesdk-3.5.4/kbabel/commonui/Makefile.am    2005-09-10 04:20:53.000000000 -0400
     117+++ kdesdk-3.5.4-new/kbabel/commonui/Makefile.am        2006-08-01 14:55:54.000000000 -0400
    117118@@ -2,7 +2,7 @@
    118119 
    119120 # this is the program that gets installed.  it's name is used for all
    … …  
    123124 
    124125 # set the include path for X, qt and KDE. Put local paths before all_includes.
    125126 INCLUDES         = -I$(srcdir)/../common -I../common -I$(srcdir)/../kbabeldict -I../kbabeldict $(all_includes)
    126 --- kdesdk-3.5.0/kbabel/kbabel/Makefile.am      2005-10-10 10:58:10.000000000 -0400
    127 +++ kdesdk-3.5.0-new/kbabel/kbabel/Makefile.am  2005-12-11 00:47:09.000000000 -0500
     127--- kdesdk-3.5.4/kbabel/kbabel/Makefile.am      2005-10-10 10:58:10.000000000 -0400
     128+++ kdesdk-3.5.4-new/kbabel/kbabel/Makefile.am  2006-08-01 14:55:54.000000000 -0400
    128129@@ -5,7 +5,9 @@
    129130 # this is the program that gets installed.  it's name is used for all
    130131 # of the other Makefile.am variables
    … …  
    151152 
    152153 # these are the headers for your project
    153154 noinst_HEADERS   = kbabel.h kbabelview.h \
    154 --- kdesdk-3.5.0/kbabel/kbabel/main.cpp 2005-10-10 10:58:10.000000000 -0400
    155 +++ kdesdk-3.5.0-new/kbabel/kbabel/main.cpp     2005-12-11 00:47:09.000000000 -0500
    156 @@ -503,7 +503,7 @@
     155--- kdesdk-3.5.4/kbabel/kbabel/main.cpp 2006-07-22 04:11:50.000000000 -0400
     156+++ kdesdk-3.5.4-new/kbabel/kbabel/main.cpp     2006-08-01 14:55:54.000000000 -0400
     157@@ -506,7 +506,7 @@
    157158 };
    158159 
    159160 
    … …  
    162163 {
    163164     KAboutData about("kbabel",I18N_NOOP("KBabel"),VERSION,
    164165        I18N_NOOP("An advanced PO file editor"),KAboutData::License_GPL,
    165 --- kdesdk-3.5.0/kbabel/kbabeldict/Makefile.am  2005-09-10 04:20:53.000000000 -0400
    166 +++ kdesdk-3.5.0-new/kbabel/kbabeldict/Makefile.am      2005-12-11 00:47:09.000000000 -0500
     166--- kdesdk-3.5.4/kbabel/kbabeldict/Makefile.am  2005-09-10 04:20:53.000000000 -0400
     167+++ kdesdk-3.5.4-new/kbabel/kbabeldict/Makefile.am      2006-08-01 14:55:54.000000000 -0400
    167168@@ -6,17 +6,15 @@
    168169 
    169170 pkgincludedir = $(includedir)/kbabel
    … …  
    200201 
    201202 # these are the headers for your project
    202203 noinst_HEADERS   =  kbabeldict.h kbabeldictview.h kbabelsplash.h aboutmoduledlg.h
    203 --- kdesdk-3.5.0/kbabel/kbabeldict/main.cpp     2005-09-10 04:20:53.000000000 -0400
    204 +++ kdesdk-3.5.0-new/kbabel/kbabeldict/main.cpp 2005-12-11 00:47:09.000000000 -0500
     204--- kdesdk-3.5.4/kbabel/kbabeldict/main.cpp     2006-07-22 04:11:50.000000000 -0400
     205+++ kdesdk-3.5.4-new/kbabel/kbabeldict/main.cpp 2006-08-01 14:55:54.000000000 -0400
    205206@@ -107,7 +107,7 @@
    206207 };
    207208 
    … …  
    211212 {
    212213     KLocale::setMainCatalogue("kbabel");
    213214     
    214 --- kdesdk-3.5.0/kbugbuster/Makefile.am 2005-09-10 04:21:11.000000000 -0400
    215 +++ kdesdk-3.5.0-new/kbugbuster/Makefile.am     2005-12-11 00:47:09.000000000 -0500
     215--- kdesdk-3.5.4/kbugbuster/Makefile.am 2005-09-10 04:21:11.000000000 -0400
     216+++ kdesdk-3.5.4-new/kbugbuster/Makefile.am     2006-08-01 14:55:54.000000000 -0400
    216217@@ -6,12 +6,14 @@
    217218 
    218219 SUBDIRS = backend gui pics $(KRESOURCES_SUBDIR)
    … …  
    232233 
    233234 xdg_apps_DATA = kbugbuster.desktop
    234235 
    235 --- kdesdk-3.5.0/kbugbuster/configure.in.in     2005-09-10 04:21:11.000000000 -0400
    236 +++ kdesdk-3.5.0-new/kbugbuster/configure.in.in 2005-12-11 00:47:09.000000000 -0500
     236--- kdesdk-3.5.4/kbugbuster/configure.in.in     2005-09-10 04:21:11.000000000 -0400
     237+++ kdesdk-3.5.4-new/kbugbuster/configure.in.in 2006-08-01 14:55:54.000000000 -0400
    237238@@ -2,6 +2,7 @@
    238239 KDE_CHECK_HEADER(libkcal/resourcecalendar.h,HAVE_KCAL=1,
    239240  AC_MSG_WARN([Unable to find libkcal. The Bugzilla todo list \
    … …  
    242243 AM_CONDITIONAL(include_kcalresource, test "$HAVE_KCAL" = 1)
    243244 ])
    244245 
    245 --- kdesdk-3.5.0/kbugbuster/main.cpp    2005-09-10 04:21:11.000000000 -0400
    246 +++ kdesdk-3.5.0-new/kbugbuster/main.cpp        2005-12-11 00:47:09.000000000 -0500
     246--- kdesdk-3.5.4/kbugbuster/main.cpp    2005-09-10 04:21:11.000000000 -0400
     247+++ kdesdk-3.5.4-new/kbugbuster/main.cpp        2006-08-01 14:55:54.000000000 -0400
    247248@@ -42,7 +42,7 @@
    248249   KCmdLineLastOption
    249250 };
    … …  
    253254 {
    254255     KAboutData aboutData( "kbugbuster", I18N_NOOP( "KBugBuster" ),
    255256         VERSION, description, KAboutData::License_GPL,
    256 --- kdesdk-3.5.0/kcachegrind/kcachegrind/Makefile.am    2005-09-10 04:21:07.000000000 -0400
    257 +++ kdesdk-3.5.0-new/kcachegrind/kcachegrind/Makefile.am        2005-12-11 00:47:09.000000000 -0500
     257--- kdesdk-3.5.4/kcachegrind/kcachegrind/Makefile.am    2005-09-10 04:21:07.000000000 -0400
     258+++ kdesdk-3.5.4-new/kcachegrind/kcachegrind/Makefile.am        2006-08-01 14:55:54.000000000 -0400
    258259@@ -1,6 +1,8 @@
    259260-bin_PROGRAMS = kcachegrind
    260261+kdeinit_LTLIBRARIES = kcachegrind.la
    … …  
    289290 rcdir = $(kde_datadir)/kcachegrind
    290291 rc_DATA = kcachegrindui.rc
    291292 
    292 --- kdesdk-3.5.0/kcachegrind/kcachegrind/main.cpp       2005-09-10 04:21:07.000000000 -0400
    293 +++ kdesdk-3.5.0-new/kcachegrind/kcachegrind/main.cpp   2005-12-11 00:47:09.000000000 -0500
     293--- kdesdk-3.5.4/kcachegrind/kcachegrind/main.cpp       2005-09-10 04:21:07.000000000 -0400
     294+++ kdesdk-3.5.4-new/kcachegrind/kcachegrind/main.cpp   2006-08-01 14:55:54.000000000 -0400
    294295@@ -40,7 +40,7 @@
    295296   KCmdLineLastOption // End of options.
    296297 };
    … …  
    300301 {
    301302   KAboutData aboutData("kcachegrind",
    302303                        I18N_NOOP("KCachegrind"),
    303 --- kdesdk-3.5.0/kcachegrind/kcachegrind/sourceitem.h   2005-09-10 04:21:07.000000000 -0400
    304 +++ kdesdk-3.5.0-new/kcachegrind/kcachegrind/sourceitem.h       2005-12-11 00:47:09.000000000 -0500
     304--- kdesdk-3.5.4/kcachegrind/kcachegrind/sourceitem.h   2005-09-10 04:21:07.000000000 -0400
     305+++ kdesdk-3.5.4-new/kcachegrind/kcachegrind/sourceitem.h       2006-08-01 14:55:54.000000000 -0400
    305306@@ -25,6 +25,7 @@
    306307 
    307308 #include <qlistview.h>
    … …  
    310311 
    311312 class SourceView;
    312313 
    313 --- kdesdk-3.5.0/kioslave/svn/configure.in.in   2005-10-10 10:58:25.000000000 -0400
    314 +++ kdesdk-3.5.0-new/kioslave/svn/configure.in.in       2005-12-11 00:47:09.000000000 -0500
     314--- kdesdk-3.5.4/kioslave/svn/configure.in.in   2005-10-10 10:58:25.000000000 -0400
     315+++ kdesdk-3.5.4-new/kioslave/svn/configure.in.in       2006-08-01 14:55:54.000000000 -0400
    315316@@ -155,3 +155,5 @@
    316317 AC_SUBST(SVN_CPPFLAGS)
    317318 AC_SUBST(SVNLD)
    318319 AM_CONDITIONAL(include_kioslave_svn, test -n "$SVN_SUBDIR")
    319320+
    320321+export DO_NOT_COMPILE="$DO_NOT_COMPILE kioslave"
    321 --- kdesdk-3.5.0/kmtrace/Makefile.am    2005-09-10 04:20:58.000000000 -0400
    322 +++ kdesdk-3.5.0-new/kmtrace/Makefile.am        2005-12-11 00:47:09.000000000 -0500
     322--- kdesdk-3.5.4/kmtrace/Makefile.am    2005-09-10 04:20:58.000000000 -0400
     323+++ kdesdk-3.5.4-new/kmtrace/Makefile.am        2006-08-01 14:55:54.000000000 -0400
    323324@@ -21,15 +21,16 @@
    324325 LDADD = $(LIB_KDECORE) -liberty
    325326 INCLUDES = $(all_includes)
    … …  
    344345 
    345346 bin_SCRIPTS = kminspector
    346347 
    347 --- kdesdk-3.5.0/kmtrace/demangle.cpp   2005-09-10 04:20:58.000000000 -0400
    348 +++ kdesdk-3.5.0-new/kmtrace/demangle.cpp       2005-12-11 00:47:09.000000000 -0500
     348--- kdesdk-3.5.4/kmtrace/demangle.cpp   2005-09-10 04:20:58.000000000 -0400
     349+++ kdesdk-3.5.4-new/kmtrace/demangle.cpp       2006-08-01 14:55:54.000000000 -0400
    349350@@ -36,7 +36,7 @@
    350351 }
    351352 
    … …  
    355356 {
    356357    char buf[1024];
    357358 
    358 --- kdesdk-3.5.0/kmtrace/kmtrace.cpp    2005-10-10 10:58:21.000000000 -0400
    359 +++ kdesdk-3.5.0-new/kmtrace/kmtrace.cpp        2005-12-11 00:47:09.000000000 -0500
     359--- kdesdk-3.5.4/kmtrace/kmtrace.cpp    2005-10-10 10:58:21.000000000 -0400
     360+++ kdesdk-3.5.4-new/kmtrace/kmtrace.cpp        2006-08-01 14:55:54.000000000 -0400
    360361@@ -576,7 +576,7 @@
    361362   KCmdLineLastOption
    362363 };
    … …  
    366367 {
    367368   KInstance instance("kmtrace");
    368369 
    369 --- kdesdk-3.5.0/kmtrace/match.cpp      2005-09-10 04:20:58.000000000 -0400
    370 +++ kdesdk-3.5.0-new/kmtrace/match.cpp  2005-12-11 00:47:09.000000000 -0500
     370--- kdesdk-3.5.4/kmtrace/match.cpp      2005-09-10 04:20:58.000000000 -0400
     371+++ kdesdk-3.5.4-new/kmtrace/match.cpp  2006-08-01 14:55:54.000000000 -0400
    371372@@ -13,7 +13,7 @@
    372373 #include <kstandarddirs.h>
    373374 #include <kcmdlineargs.h>
    … …  
    377378 {
    378379    char buf[1024];
    379380    if (argc != 3)
    380 --- kdesdk-3.5.0/kompare/Makefile.am    2005-09-10 04:21:05.000000000 -0400
    381 +++ kdesdk-3.5.0-new/kompare/Makefile.am        2005-12-11 00:47:09.000000000 -0500
     381--- kdesdk-3.5.4/kompare/Makefile.am    2005-09-10 04:21:05.000000000 -0400
     382+++ kdesdk-3.5.4-new/kompare/Makefile.am        2006-08-01 14:55:54.000000000 -0400
    382383@@ -22,12 +22,14 @@
    383384 #########################################################################
    384385 # this is the program that gets installed.  it's name is used for all
    … …  
    398399        $(top_builddir)/kompare/interfaces/libkompareinterface.la \
    399400        $(top_builddir)/kompare/libdialogpages/libdialogpages.la \
    400401        -lktexteditor
    401 --- kdesdk-3.5.0/kompare/main.cpp       2005-09-10 04:21:05.000000000 -0400
    402 +++ kdesdk-3.5.0-new/kompare/main.cpp   2005-12-11 00:47:09.000000000 -0500
     402--- kdesdk-3.5.4/kompare/main.cpp       2005-09-10 04:21:05.000000000 -0400
     403+++ kdesdk-3.5.4-new/kompare/main.cpp   2006-08-01 14:55:55.000000000 -0400
    403404@@ -47,7 +47,7 @@
    404405        KCmdLineLastOption
    405406 };
    … …  
    409410 {
    410411        KAboutData aboutData( "kompare", I18N_NOOP("Kompare"), version, description,
    411412                              KAboutData::License_GPL,
    412 --- kdesdk-3.5.0/kspy/main.cpp  2005-09-10 04:20:58.000000000 -0400
    413 +++ kdesdk-3.5.0-new/kspy/main.cpp      2005-12-11 00:47:09.000000000 -0500
     413--- kdesdk-3.5.4/kspy/main.cpp  2005-09-10 04:20:58.000000000 -0400
     414+++ kdesdk-3.5.4-new/kspy/main.cpp      2006-08-01 14:55:55.000000000 -0400
    414415@@ -32,7 +32,7 @@
    415416   // INSERT YOUR COMMANDLINE OPTIONS HERE
    416417 };
    … …  
    420421 {
    421422 
    422423   KAboutData aboutData( "spy", I18N_NOOP("Spy"),
    423 --- kdesdk-3.5.0/kstartperf/Makefile.am 2005-09-10 04:20:58.000000000 -0400
    424 +++ kdesdk-3.5.0-new/kstartperf/Makefile.am     2005-12-11 00:47:09.000000000 -0500
     424--- kdesdk-3.5.4/kstartperf/Makefile.am 2005-09-10 04:20:58.000000000 -0400
     425+++ kdesdk-3.5.4-new/kstartperf/Makefile.am     2006-08-01 14:55:55.000000000 -0400
    425426@@ -5,10 +5,11 @@
    426427 # libkstartperf_la_LIBADD = ../libltdl/libltdlc.la
    427428 libkstartperf_la_SOURCES = libkstartperf.c
    … …  
    438439 
    439440 messages:
    440441        $(XGETTEXT) $(kstartperf_SOURCES) -o $(podir)/kstartperf.pot
    441 --- kdesdk-3.5.0/kstartperf/kstartperf.cpp      2005-09-10 04:20:58.000000000 -0400
    442 +++ kdesdk-3.5.0-new/kstartperf/kstartperf.cpp  2005-12-11 00:47:09.000000000 -0500
     442--- kdesdk-3.5.4/kstartperf/kstartperf.cpp      2005-09-10 04:20:58.000000000 -0400
     443+++ kdesdk-3.5.4-new/kstartperf/kstartperf.cpp  2006-08-01 14:55:55.000000000 -0400
    443444@@ -69,7 +69,7 @@
    444445 }
    445446 
    … …  
    449450 {
    450451     KAboutData aboutData("kstartperf", I18N_NOOP("KStartPerf"),
    451452            "1.0", I18N_NOOP("Measures start up time of a KDE application"),
    452 --- kdesdk-3.5.0/kuiviewer/Makefile.am  2005-09-10 04:21:10.000000000 -0400
    453 +++ kdesdk-3.5.0-new/kuiviewer/Makefile.am      2005-12-11 00:47:09.000000000 -0500
     453--- kdesdk-3.5.4/kuiviewer/Makefile.am  2005-09-10 04:21:10.000000000 -0400
     454+++ kdesdk-3.5.4-new/kuiviewer/Makefile.am      2006-08-01 14:55:55.000000000 -0400
    454455@@ -21,12 +21,14 @@
    455456 #########################################################################
    456457 # this is the program that gets installed.  it's name is used for all
    … …  
    470471 
    471472 xdg_apps_DATA =kuiviewer.desktop
    472473 
    473 --- kdesdk-3.5.0/kuiviewer/main.cpp     2005-09-10 04:21:10.000000000 -0400
    474 +++ kdesdk-3.5.0-new/kuiviewer/main.cpp 2005-12-11 00:47:09.000000000 -0500
     474--- kdesdk-3.5.4/kuiviewer/main.cpp     2005-09-10 04:21:10.000000000 -0400
     475+++ kdesdk-3.5.4-new/kuiviewer/main.cpp 2006-08-01 14:55:55.000000000 -0400
    475476@@ -38,7 +38,7 @@
    476477     KCmdLineLastOption
    477478 };
    … …  
    481482 {
    482483     KAboutData about("kuiviewer", I18N_NOOP("KUIViewer"), "0.1",
    483484                     I18N_NOOP("Displays Designer's UI files"),
    484 --- kdesdk-3.5.0/poxml/Makefile.am      2005-09-10 04:21:06.000000000 -0400
    485 +++ kdesdk-3.5.0-new/poxml/Makefile.am  2005-12-11 00:47:09.000000000 -0500
     485--- kdesdk-3.5.4/poxml/Makefile.am      2005-09-10 04:21:06.000000000 -0400
     486+++ kdesdk-3.5.4-new/poxml/Makefile.am  2006-08-01 14:55:55.000000000 -0400
    486487@@ -1,30 +1,31 @@
    487488-
    488489-bin_PROGRAMS = split2po xml2pot po2xml swappo transxx
    … …  
    536537 
    537538 parser:
    538539        cd $(srcdir) && java antlr.Tool gettext.g
    539 --- kdesdk-3.5.1/poxml/po2xml.cpp.orig  2006-02-28 07:35:55.000000000 -0500
    540 +++ kdesdk-3.5.1/poxml/po2xml.cpp       2006-02-28 07:35:47.000000000 -0500
     540--- kdesdk-3.5.4/poxml/po2xml.cpp       2005-09-10 04:21:06.000000000 -0400
     541+++ kdesdk-3.5.4-new/poxml/po2xml.cpp   2006-08-01 14:55:55.000000000 -0400
    541542@@ -12,6 +12,8 @@
    542543 #include "antlr/AST.hpp"
    543544 #include "antlr/CommonAST.hpp"
    … …  
    556557 {
    557558     if (argc != 3) {
    558559         qWarning("usage: %s english-XML translated-PO", argv[0]);
    559 --- kdesdk-3.5.1/poxml/split.cpp.orig   2006-02-28 07:32:04.000000000 -0500
    560 +++ kdesdk-3.5.1/poxml/split.cpp        2006-02-28 07:31:08.000000000 -0500
     560--- kdesdk-3.5.4/poxml/split.cpp        2005-11-19 05:24:05.000000000 -0500
     561+++ kdesdk-3.5.4-new/poxml/split.cpp    2006-08-01 14:55:55.000000000 -0400
    561562@@ -1,10 +1,11 @@
    562563 #include "parser.h"
    563564 #include <stdlib.h>
    … …  
    571572 {
    572573     bool report_mismatches = qstrcmp(getenv("REPORT_MISMATCHES"), "no");
    573574 
    574 --- kdesdk-3.5.1/poxml/swappo.cpp.orig  2006-02-28 07:37:37.000000000 -0500
    575 +++ kdesdk-3.5.1/poxml/swappo.cpp       2006-02-28 07:37:32.000000000 -0500
     575--- kdesdk-3.5.4/poxml/swappo.cpp       2005-09-10 04:21:06.000000000 -0400
     576+++ kdesdk-3.5.4-new/poxml/swappo.cpp   2006-08-01 14:55:55.000000000 -0400
    576577@@ -3,8 +3,9 @@
    577578 #include "GettextParser.hpp"
    578579 #include <fstream>
    … …  
    584585 {
    585586     if ( argc != 2 ) {
    586587         qWarning( "usage: %s pofile", argv[0] );
    587 --- kdesdk-3.5.1/poxml/transxx.cpp.orig 2006-02-28 07:39:31.000000000 -0500
    588 +++ kdesdk-3.5.1/poxml/transxx.cpp      2006-02-28 07:39:26.000000000 -0500
     588--- kdesdk-3.5.4/poxml/transxx.cpp      2005-10-10 10:58:21.000000000 -0400
     589+++ kdesdk-3.5.4-new/poxml/transxx.cpp  2006-08-01 14:55:55.000000000 -0400
    589590@@ -8,7 +8,9 @@
    590591 #include <qdatetime.h>
    591592 #include <qfileinfo.h>
    … …  
    597598 {
    598599     if ( argc != 2 && argc != 4 ) {
    599600         qWarning( "usage: %s [--text translation] potfile", argv[0] );
    600 --- kdesdk-3.5.1/poxml/xml2pot.cpp.orig 2006-02-28 07:33:39.000000000 -0500
    601 +++ kdesdk-3.5.1/poxml/xml2pot.cpp      2006-02-28 07:33:47.000000000 -0500
     601--- kdesdk-3.5.4/poxml/xml2pot.cpp      2005-09-10 04:21:06.000000000 -0400
     602+++ kdesdk-3.5.4-new/poxml/xml2pot.cpp  2006-08-01 14:55:55.000000000 -0400
    602603@@ -3,10 +3,11 @@
    603604 #include <iostream>
    604605 #include <qfileinfo.h>
    … …  
    612613 {
    613614     if (argc != 2) {
    614615         qWarning("usage: %s english-XML", argv[0]);
    615 --- kdesdk-3.5.0/umbrello/umbrello/Makefile.am  2005-11-08 17:28:41.000000000 -0500
    616 +++ kdesdk-3.5.0-new/umbrello/umbrello/Makefile.am      2005-12-11 00:47:33.000000000 -0500
     616--- kdesdk-3.5.4/umbrello/umbrello/Makefile.am  2006-07-22 04:12:01.000000000 -0400
     617+++ kdesdk-3.5.4-new/umbrello/umbrello/Makefile.am      2006-08-01 14:56:33.000000000 -0400
    617618@@ -1,7 +1,9 @@
    618619-bin_PROGRAMS = umbrello
    619620+bin_PROGRAMS =
    … …  
    626627+umbrello_la_SOURCES = activitywidget.cpp \
    627628 actor.cpp \
    628629 actorwidget.cpp \
    629  adaimport.cpp \
    630 @@ -105,7 +107,7 @@
     630 aligntoolbar.cpp \
     631@@ -113,7 +115,7 @@
    631632 worktoolbar.cpp
    632633 
    633  #umbrello_LDADD   = ./refactoring/librefactoring.la ./classparser/libclassparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_KDEPRINT) $(LIB_KIO)
    634 -umbrello_LDADD   = ./refactoring/librefactoring.la ./classparser/libclassparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(LIB_KDEPRINT) $(LIB_KIO)
    635 +umbrello_la_LIBADD   = ./refactoring/librefactoring.la ./classparser/libclassparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(LIB_KDEPRINT) $(LIB_KIO)
     634 #umbrello_LDADD   = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_KDEPRINT) $(LIB_KIO)
     635-umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(LIB_KDEPRINT) $(LIB_KIO)
     636+umbrello_la_LIBADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(LIB_KDEPRINT) $(LIB_KIO)
    636637 
    637638 ## See section "dnl Not GPL compatible" in ../configure.in.in
    638  # SUBDIRS = $(AUTOLAYOUT_DIR) classparser dialogs clipboard pics codegenerators headings refactoring
    639 @@ -126,7 +128,7 @@
     639 # SUBDIRS = $(AUTOLAYOUT_DIR) codeimport dialogs clipboard pics codegenerators headings refactoring
     640@@ -134,7 +136,7 @@
    640641 
    641642 METASOURCES = AUTO
    642643 
    … …  
    645646 
    646647 messages: rc.cpp
    647648        $(PREPARETIPS) > tips.cpp
    648 --- kdesdk-3.5.0/umbrello/umbrello/classparser/Makefile.am      2005-09-10 04:20:56.000000000 -0400
    649 +++ kdesdk-3.5.0-new/umbrello/umbrello/classparser/Makefile.am  2005-12-11 00:47:09.000000000 -0500
    650 @@ -1,4 +1,4 @@
    651 -INCLUDES = -I../dialogs $(all_includes)
    652 +INCLUDES = -I../dialogs -I@FINKPREFIX@/lib/flex/include $(all_includes)
     649--- kdesdk-3.5.4/umbrello/umbrello/main.cpp     2006-07-22 04:12:01.000000000 -0400
     650+++ kdesdk-3.5.4-new/umbrello/umbrello/main.cpp 2006-08-01 14:55:56.000000000 -0400
     651@@ -81,7 +81,7 @@
     652  */
     653 void exportAllViews(KCmdLineArgs *args, const QCStringList &exportOpt);
    653654 
    654  noinst_LTLIBRARIES = libclassparser.la
    655  libclassparser_la_SOURCES = ast.cpp driver.cpp errors.cpp lexer.cpp lookup.cpp parser.cpp tree_parser.cpp urlutil.cpp ast_utils.cpp cpptree2uml.cpp
    656 --- kdesdk-3.5.0/umbrello/umbrello/main.cpp     2005-09-10 04:20:57.000000000 -0400
    657 +++ kdesdk-3.5.0-new/umbrello/umbrello/main.cpp 2005-12-11 00:47:09.000000000 -0500
    658 @@ -42,7 +42,7 @@
    659          KCmdLineLastOption
    660      };
    661  
    662655-int main(int argc, char *argv[]) {
    663656+extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) {
    664657     KAboutData aboutData( "umbrello", I18N_NOOP("Umbrello UML Modeller"),
    665658                           UMBRELLO_VERSION, description, KAboutData::License_GPL,
    666                            I18N_NOOP("(c) 2001 Paul Hensgen, (c) 2002-2005 Umbrello UML Modeller Authors"), 0,
    667 --- kdesdk/kbabel/kbabeldict/dictionarymenu.h   (revision 514661)
    668 +++ kdesdk/kbabel/kbabeldict/dictionarymenu.h   (working copy)
    669 @@ -37,12 +37,13 @@
    670  #include <qobject.h>
    671  #include <qstringlist.h>
    672  #include <qguardedptr.h>
    673 +#include <kdemacros.h>
    674  
    675  class QSignalMapper;
    676  class KPopupMenu;
    677  class KActionCollection;
    678  
    679 -class DictionaryMenu : public QObject
    680 +class KDE_EXPORT DictionaryMenu : public QObject
    681  {
    682     Q_OBJECT
    683  
    684 --- kdesdk/kbabel/kbabeldict/kbabeldictbox.h    (revision 514661)
    685 +++ kdesdk/kbabel/kbabeldict/kbabeldictbox.h    (working copy)
    686 @@ -60,7 +60,7 @@
    687  };
    688  
    689  
    690 -class KBabelDictBox : public QWidget, virtual public KBabelDictIFace
    691 +class KDE_EXPORT KBabelDictBox : public QWidget, virtual public KBabelDictIFace
    692  {
    693      Q_OBJECT
    694  
    695 --- kdesdk/kbabel/kbabeldict/dictchooser.h      (revision 514661)
    696 +++ kdesdk/kbabel/kbabeldict/dictchooser.h      (working copy)
    697 @@ -47,7 +47,7 @@
    698  class QListBoxItem;
    699  
    700  
    701 -class DictChooser : public QWidget
    702 +class KDE_EXPORT DictChooser : public QWidget
    703  {
    704      Q_OBJECT
    705  
    706 --- kdesdk/kbabel/commonui/finddialog.h (revision 514661)
    707 +++ kdesdk/kbabel/commonui/finddialog.h (working copy)
    708 @@ -44,7 +44,7 @@
    709  
    710  #include "findoptions.h"
    711  
    712 -class FindDialog : public KDialogBase
    713 +class KDE_EXPORT FindDialog : public KDialogBase
    714  {
    715         Q_OBJECT
    716  public:
    717 @@ -119,7 +119,7 @@
    718         bool _replaceDlg;
    719  };
    720  
    721 -class ReplaceDialog : public KDialogBase
    722 +class KDE_EXPORT ReplaceDialog : public KDialogBase
    723  {
    724         Q_OBJECT
    725  public:
    726 --- kdesdk/kbabel/commonui/projectprefwidgets.h (revision 514661)
    727 +++ kdesdk/kbabel/commonui/projectprefwidgets.h (working copy)
    728 @@ -62,7 +62,7 @@
    729  
    730  struct ModuleInfo;
    731  
    732 -class SavePreferences : public KTabCtl
    733 +class KDE_EXPORT SavePreferences : public KTabCtl
    734  {
    735     Q_OBJECT
    736  public:
    737 --- kdesdk/kbabel/commonui/toolaction.h (revision 514661)
    738 +++ kdesdk/kbabel/commonui/toolaction.h (working copy)
    739 @@ -39,7 +39,7 @@
    740  class KShortcut;
    741  class KActionCollection;
    742  
    743 -class ToolAction : public KAction
    744 +class KDE_EXPORT ToolAction : public KAction
    745  {
    746      Q_OBJECT
    747  public:
    748 --- kdesdk/kbabel/commonui/projectpref.h        (revision 514661)
    749 +++ kdesdk/kbabel/commonui/projectpref.h        (working copy)
    750 @@ -55,7 +55,7 @@
    751  
    752  namespace KBabel {
    753  
    754 -class ProjectDialog : public KConfigDialog
    755 +class KDE_EXPORT ProjectDialog : public KConfigDialog
    756  {
    757      Q_OBJECT
    758  public:
    759 --- kdesdk/kbabel/commonui/roughtransdlg.h      (revision 514661)
    760 +++ kdesdk/kbabel/commonui/roughtransdlg.h      (working copy)
    761 @@ -50,7 +50,7 @@
    762  class QRadioButton;
    763  class QVBox;
    764  
    765 -class RoughTransDlg : public KDialogBase
    766 +class KDE_EXPORT RoughTransDlg : public KDialogBase
    767  {
    768      Q_OBJECT
    769  
    770 --- kdesdk/kbabel/commonui/context.h    (revision 514661)
    771 +++ kdesdk/kbabel/commonui/context.h    (working copy)
    772 @@ -74,7 +74,7 @@
    773   * @note It requires a KPart implementing KTextEditor interface with selections.
    774   * @author Stanislav Visnovsky <visnovsky@kde.org>
    775   */
    776 -class SourceContext : public QWidget
    777 +class KDE_EXPORT SourceContext : public QWidget
    778  {
    779      Q_OBJECT
    780  public:
    781 --- kdesdk/kbabel/commonui/projectwizard.h      (revision 514661)
    782 +++ kdesdk/kbabel/commonui/projectwizard.h      (working copy)
    783 @@ -45,7 +45,7 @@
    784  
    785  namespace KBabel {
    786  
    787 -class ProjectWizard : public KWizard
    788 +class KDE_EXPORT ProjectWizard : public KWizard
    789  {
    790      Q_OBJECT
    791  public:
    792 --- kdesdk/kbabel/commonui/toolselectionwidget.h        (revision 514661)
    793 +++ kdesdk/kbabel/commonui/toolselectionwidget.h        (working copy)
    794 @@ -33,10 +33,11 @@
    795  #define TOOLSELECTIONWIDGET_H
    796  
    797  #include "kactionselector.h"
    798 +#include <kdemacros.h>
    799  
    800  class KDataToolInfo;
    801  
    802 -class ToolSelectionWidget : public KActionSelector
    803 +class KDE_EXPORT ToolSelectionWidget : public KActionSelector
    804  {
    805      Q_OBJECT
    806  public:
     659                           I18N_NOOP("(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"), 0,

  • kdesdk3/Portfile

     
    11# $Id$
    22
    3 #Synced with Fink, Version 3.5.1-1023
     3#Synced with Fink, Version 3.5.4-1021
    44
    55PortSystem 1.0
    66name            kdesdk3
    7 version         3.5.1
    8 revision        2
    9 set kdeadmin    kde-admindir-3.5.1
     7version         3.5.4
     8set kdeadmin    kde-admindir-252
    109categories      kde
    1110maintainers     ben@macports.org takanori@macports.org
    1211description     KDE SDK. \
    1312                NB No KDE sound support. \
    1413                No SVN support.
    1514platforms       darwin
    16 master_sites    opendarwin::kde351 \
     15master_sites    opendarwin::kde354 \
    1716                opendarwin::admin
    1817#               kde:stable/${version}/src
    1918#               http://ranger.befunk.com/fink/:admin
    20 extract.suffix  .tar.bz2
    2119use_bzip2       yes
    2220distname        kdesdk-${version}
    23 distfiles       ${distname}.tar.bz2:kde351 \
     21distfiles       ${distname}.tar.bz2:kde354 \
    2422                ${kdeadmin}.tar.bz2:admin
    2523depends_build   port:autoconf \
    26                 port:automake
    27 depends_lib     port:kdebase3 \
    28                 port:kdepim3 \
    29                 port:db4
     24                port:unsermake
     25depends_lib     port:db4 \
     26                port:kdebase3 \
     27                port:kdepim3
     28#               port:subversion
    3029
    31 checksums       ${distname}.tar.bz2 md5 93199b8bf5793681fdb2e5cbcfcfbd93 \
    32                 ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
     30checksums       ${distname}.tar.bz2 md5 2150e6a4ce5e42886a4afc6c0198c30c \
     31                ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
    3332
    34 extract.only ${distname}.tar.bz2
    35 post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
     33extract.only    ${distname}.tar.bz2
     34post-extract    { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
    3635
    3736patchfiles      kdesdk3.patch
    3837patch           {
    3938                cd ${worksrcpath}
    4039                foreach file $patchfiles {
    41                     system "sed -e 's,@FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
     40                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
    4241                }
     42                system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' admin/*"
    4343}
    44 post-patch      {
    45                 reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
    46                 reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
     44post-patch      {
     45                reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
    4746                reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
    48                 reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
    49                 foreach file [glob ${worksrcpath}/admin/*] {
    50                     reinplace "s|-O2|-Os|g" $file
    51                     reinplace "s|doc/HTML|doc/kde|g" $file
    52                     reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
    53                 }
    5447                foreach file {CompileScript.sh InstallScript.sh} {
    55                     file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
     48                    file copy ${filespath}/${file} ${worksrcpath}
    5649                    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
    5750                    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
    5851                    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
    … …  
    6255                    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
    6356                    file attributes ${worksrcpath}/${file} -permissions 0755
    6457                }
     58                reinplace "s|doc/HTML|doc/kde|g" ${worksrcpath}/scripts/kdedoc
    6559}
    6660
    67 configure.args  --with-db-name=db-4.3 --with-distribution='DarwinPorts/Mac OS X' --without-subversion --without-arts
     61configure.args  --with-db-name=db-4.3 --with-db-include-dir=${prefix}/include/db4 --with-distribution='MacPorts/Mac OS X' --without-subversion --without-arts
    6862
    6963configure       {}
    7064build           { system "cd ${worksrcpath} && ./CompileScript.sh" }
    7165destroot        { system "cd ${worksrcpath} && ./InstallScript.sh" }
    7266
    73 post-destroot   {
     67post-destroot   {
    7468                xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
    7569                xinstall -m 644 -W ${worksrcpath} COPYING README ${destroot}${prefix}/share/doc/${name}
    7670}
    77 
    78 platform darwin 6 {
    79         depends_lib-append      lib:libdl:dlcompat
    80 }

  • kdetoys3/files/InstallScript.sh

     
    11#!/bin/sh -e
    22
    3         export PREFIX="%p"
     3        export PREFIX="%p" USE_UNSERMAKE=1
    44        . ./environment-helper.sh
    55
    6 #darwinports
    7         export UNSERMAKE="no"
     6        ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
    87
    9         ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
    10 
    118        mkdir -p %i/share/doc/installed-packages
    129        touch %i/share/doc/installed-packages/%N
    1310        touch %i/share/doc/installed-packages/%N-base

  • kdetoys3/files/CompileScript.sh

     
    11#!/bin/sh -e
    22
    3         export HOME=/tmp
    4         export PREFIX="%p"
     3        export PREFIX="%p" USE_UNSERMAKE=1
    54        . ./environment-helper.sh
    6         export lt_cv_sys_max_cmd_len=65536
    75
    8 #darwinports
    9         export UNSERMAKE="no"
    10 
    11         export CC=gcc CXX=g++
    12 
    136        ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
    147        ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
    15         ./build-helper.sh make      %N %v %r make all all_libraries="$ALL_LIBRARIES"
     8        ./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS

  • kdetoys3/Portfile

     
    11# $Id$
    22
    3 #Synced with Fink, Version 3.5.1-1023
     3#Synced with Fink, Version 3.5.4-1021
    44
    55PortSystem 1.0
    66name            kdetoys3
    7 version         3.5.1
    8 revision        1
    9 set kdeadmin    kde-admindir-3.5.1
     7version         3.5.4
     8set kdeadmin    kde-admindir-252
    109categories      kde
    1110maintainers     ben@macports.org takanori@macports.org
    1211description     KDE toys. \
    1312                NB No KDE sound support.
    1413platforms       darwin
    15 master_sites    opendarwin::kde351 \
     14master_sites    opendarwin::kde354 \
    1615                opendarwin::admin
    1716#               kde:stable/${version}/src
    1817#               http://ranger.befunk.com/fink/:admin
    19 extract.suffix  .tar.bz2
    2018use_bzip2       yes
    2119distname        kdetoys-${version}
    22 distfiles       ${distname}.tar.bz2:kde351 \
     20distfiles       ${distname}.tar.bz2:kde354 \
    2321                ${kdeadmin}.tar.bz2:admin
    2422depends_build   port:autoconf \
    25                 port:automake
     23                port:unsermake
    2624depends_lib     port:kdebase3
    2725
    28 checksums       ${distname}.tar.bz2 md5 d98d4f30a8aa6d43b0af06421d4d6586 \
    29                 ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
     26checksums       ${distname}.tar.bz2 md5 f959e936d05697ac6b1a0b066632b2fd \
     27                ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
    3028
    31 extract.only ${distname}.tar.bz2
    32 post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
     29extract.only    ${distname}.tar.bz2
     30post-extract    { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
    3331
    3432patchfiles      kdetoys3.patch
    3533patch           {
    3634                cd ${worksrcpath}
    3735                foreach file $patchfiles {
    38                     system "sed -e 's,@FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
     36                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
    3937                }
     38                system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' admin/*"
    4039}
    41 post-patch      {
    42                 reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
    43                 reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
     40post-patch      {
     41                reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
    4442                reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
    45                 reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
    46                 foreach file [glob ${worksrcpath}/admin/*] {
    47                     reinplace "s|-O2|-Os|g" $file
    48                     reinplace "s|doc/HTML|doc/kde|g" $file
    49                     reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
    50                 }
    5143                foreach file {CompileScript.sh InstallScript.sh} {
    52                     file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
     44                    file copy ${filespath}/${file} ${worksrcpath}
    5345                    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
    5446                    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
    5547                    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
    … …  
    6153                }
    6254}
    6355
    64 configure.args  --with-distribution='DarwinPorts/Mac OS X' --without-arts
     56configure.args  --with-distribution='MacPorts/Mac OS X' --without-arts
    6557
    6658configure       {}
    6759build           { system "cd ${worksrcpath} && ./CompileScript.sh" }
    6860destroot        { system "cd ${worksrcpath} && ./InstallScript.sh" }
    6961
    70 post-destroot   {
     62post-destroot   {
    7163                xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
    7264                xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING INSTALL README ${destroot}${prefix}/share/doc/${name}
    7365}
    74 
    75 platform darwin 6 {
    76         depends_lib-append      lib:libdl:dlcompat
    77 }

  • kdeutils3/files/InstallScript.sh

     
    11#!/bin/sh -e
    22
    3         export PREFIX="%p"
     3        export PREFIX="%p" USE_UNSERMAKE=1
    44        . ./environment-helper.sh
    55
    6 #darwinports
    7         export UNSERMAKE="no"
     6        ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d kgpg_SUBDIR_included_TRUE='#' kgpg_SUBDIR_included_FALSE=
    87
    9         ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d kgpg_SUBDIR_included_TRUE=# kgpg_SUBDIR_included_FALSE=
    10 
    118        mkdir -p %i/share/doc/installed-packages
    129        touch %i/share/doc/installed-packages/%N
    1310        touch %i/share/doc/installed-packages/%N-base

  • kdeutils3/files/kdeutils3.patch

     
    1 --- kdeutils-3.5.0/klaptopdaemon/Makefile.am    2005-09-10 04:21:28.000000000 -0400
    2 +++ kdeutils-3.5.0-new/klaptopdaemon/Makefile.am        2005-11-26 16:00:12.000000000 -0500
     1
     2--- kdeutils-3.5.4/klaptopdaemon/Makefile.am    2006-01-19 11:49:18.000000000 -0500
     3+++ kdeutils-3.5.4-new/klaptopdaemon/Makefile.am        2006-08-01 23:42:11.000000000 -0400
    34@@ -21,7 +21,7 @@
    45 kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
    56        acpi.cpp sony.cpp profile.cpp buttons.cpp apm.cpp 
    … …  
    910 kcm_laptop_la_COMPILE_FIRST = crcresult.h
    1011 
    1112 AM_CPPFLAGS = $(all_includes)
    12 --- kdeutils-3.5.0/ksim/monitors/snmp/configure.in.in   2005-10-10 10:59:12.000000000 -0400
    13 +++ kdeutils-3.5.0-new/ksim/monitors/snmp/configure.in.in       2005-11-26 16:01:00.000000000 -0500
    14 @@ -32,4 +32,4 @@
     13--- kdeutils-3.5.4/ksim/monitors/snmp/configure.in.in   2006-07-22 04:12:20.000000000 -0400
     14+++ kdeutils-3.5.4-new/ksim/monitors/snmp/configure.in.in       2006-08-01 23:42:11.000000000 -0400
     15@@ -37,4 +37,4 @@
    1516   fi
    1617 fi
    1718 
    1819-AM_CONDITIONAL(include_ksim_monitors_snmp, test "x$enable_snmp" = xyes)
    1920+AM_CONDITIONAL(include_ksim_monitors_snmp, /usr/bin/false)
    20 --- kdeutils-3.5.0/superkaramba/src/Makefile.am 2005-09-12 09:21:13.000000000 -0400
    21 +++ kdeutils-3.5.0-new/superkaramba/src/Makefile.am     2005-11-27 21:15:58.000000000 -0500
     21--- kdeutils-3.5.4/ksim/monitors/snmp/configure.in.in.orig      1969-12-31 19:00:00.000000000 -0500
     22+++ kdeutils-3.5.4-new/ksim/monitors/snmp/configure.in.in.orig  2006-07-22 04:12:20.000000000 -0400
     23@@ -0,0 +1,40 @@
     24+AC_ARG_WITH(snmp,
     25+  [AC_HELP_STRING(--with-snmp,
     26+    [enable support for SNMP @<:@default=check@:>@])],
     27+  [], with_snmp=check)
     28+
     29+enable_snmp=no
     30+if test "x$with_snmp" != xno; then
     31+  KDE_CHECK_HEADER( net-snmp/library/snmp_api.h,
     32+    [ have_netsnmp_h=yes ], [ have_netsnmp_h=no ],
     33+    [ #include <net-snmp/net-snmp-config.h>
     34+      #include <net-snmp/types.h>
     35+    ]
     36+  )
     37+
     38+  if test "$have_netsnmp_h" = yes; then
     39+    KDE_CHECK_LIB( netsnmp, snmp_sess_init, [
     40+        AC_SUBST( LIBSNMP, "-lnetsnmp" )
     41+        enable_snmp=yes
     42+    ], [], [] )
     43+  fi
     44+
     45+  if test "$enable_snmp" != yes; then
     46+    AC_MSG_CHECKING([if libnetsnmp needs -lcrypto])
     47+
     48+    dnl use a different symbol to prevent autoconf from caching
     49+    KDE_CHECK_LIB( netsnmp, snmp_open, [
     50+        AC_SUBST( LIBSNMP, "-lnetsnmp -lcrypto" )
     51+        enable_snmp=yes
     52+        AC_MSG_RESULT(yes)
     53+    ], [
     54+        AC_MSG_RESULT(no)
     55+    ], [-lcrypto] )
     56+  fi
     57+
     58+  if test "x$with_snmp" != xcheck && test "x$enable_snmp" != xyes; then
     59+    AC_MSG_ERROR([--with-snmp was given, but test for net-snmp failed])
     60+  fi
     61+fi
     62+
     63+AM_CONDITIONAL(include_ksim_monitors_snmp, test "x$enable_snmp" = xyes)
     64--- kdeutils-3.5.4/superkaramba/configure.in.in 2006-01-20 01:49:18.000000000 -0500
     65+++ kdeutils-3.5.4-new/superkaramba/configure.in.in     2006-08-01 23:42:11.000000000 -0400
     66@@ -75,3 +75,5 @@
     67 if test -z "$PYTHONINC" ; then
     68         DO_NOT_COMPILE="$DO_NOT_COMPILE superkaramba"
     69 fi
     70+
     71+AC_CHECK_HEADERS(netinet/in.h sys/sockio.h)
     72--- kdeutils-3.5.4/superkaramba/configure.in.in.orig    1969-12-31 19:00:00.000000000 -0500
     73+++ kdeutils-3.5.4-new/superkaramba/configure.in.in.orig        2006-01-20 01:49:18.000000000 -0500
     74@@ -0,0 +1,77 @@
     75+#MIN_CONFIG
     76+
     77+AM_INIT_AUTOMAKE(superkaramba, 0.38)
     78+AC_C_BIGENDIAN
     79+AC_CHECK_KDEMAXPATHLEN
     80+
     81+dnl AM_PATH_XMMS([1.0.0])
     82+dnl AC_PATH_PROG(XMMS_CONFIG, xmms-config, no)
     83+dnl AM_PATH_XMMS(1.0.0,,AC_MSG_ERROR([*** XMMS >= 1.0.0 not installed - please install first ***]))
     84+
     85+KDE_CHECK_PYTHON
     86+AC_DEFUN([AC_CHECK_XMMS],
     87+[
     88+  AC_MSG_CHECKING([for libxmms])
     89+  AC_CACHE_VAL(ac_cv_have_xmms,
     90+  [
     91+    ac_save_libs="$LIBS"
     92+    LIBS="`xmms-config --libs`"
     93+    ac_CPPFLAGS_save="$CPPFLAGS"
     94+    CPPFLAGS="$CPPFLAGS $all_includes `xmms-config --cflags`"
     95+    ac_LDFLAGS_save="$LDFLAGS"
     96+    LDFLAGS="$LDFLAGS $all_libraries"
     97+    AC_TRY_LINK(
     98+      [#include <xmms/xmmsctrl.h>],
     99+      [xmms_remote_stop(0);],
     100+      [ac_cv_have_xmms="yes"],
     101+      [ac_cv_have_xmms="no"]
     102+    )
     103+    LIBS="$ac_save_libs"
     104+    LDFLAGS="$ac_LDFLAGS_save"
     105+    CPPFLAGS="$ac_CPPFLAGS_save"
     106+  ])
     107+  AC_MSG_RESULT($ac_cv_have_xmms)
     108+  if test "$ac_cv_have_xmms" = "yes"; then
     109+    XMMS_INCLUDES="`xmms-config --cflags`"
     110+
     111+    for arg in `xmms-config --libs`; do
     112+       case $arg in
     113+           -[[lL]]*)
     114+           XMMS_LIBS="$XMMS_LIBS $arg"
     115+           ;;
     116+           *)
     117+           XMMS_LDFLAGS="$XMMS_LDFLAGS $arg"
     118+       esac
     119+    done
     120+    AC_DEFINE(HAVE_XMMS, 1, [Define if you have xmms libraries and header files.])
     121+  fi
     122+])
     123+
     124+AC_ARG_WITH(xmms,
     125+  [AC_HELP_STRING(--with-xmms,
     126+    [enable support for XMMS @<:@default=check@:>@])],
     127+  [], with_xmms=check)
     128+
     129+if test "x$with_xmms" != xno; then
     130+  AC_CHECK_XMMS
     131+
     132+  if test "x$with_xmms" != xcheck && test "x$ac_cv_have_xmms" = xno; then
     133+    AC_MSG_ERROR([--with-xmms was given, but test for XMMS failed])
     134+  fi
     135+fi
     136+AC_SUBST(XMMS_LIBS)
     137+AC_SUBST(XMMS_LDFLAGS)
     138+AC_SUBST(XMMS_INCLUDES)
     139+
     140+kde_have_knewstuff=yes
     141+KDE_CHECK_LIB(knewstuff, main, [MY_LIBKNEWSTUFF="-lknewstuff"], kde_have_knewstuff=no)
     142+if test "$kde_have_knewstuff" = "yes"; then
     143+  AC_DEFINE(HAVE_KNEWSTUFF, 1, [Define if you have knewstuff])
     144+  AC_SUBST(MY_LIBKNEWSTUFF)
     145+fi
     146+
     147+AC_CHECK_LIB(kvm, main, [LIBKVM="-lkvm"])
     148+AC_SUBST(LIBKVM)
     149+if test -z "$PYTHONINC" ; then
     150+        DO_NOT_COMPILE="$DO_NOT_COMPILE superkaramba"
     151+fi
     152--- kdeutils-3.5.4/superkaramba/src/Makefile.am 2006-01-19 11:49:35.000000000 -0500
     153+++ kdeutils-3.5.4-new/superkaramba/src/Makefile.am     2006-08-01 23:42:11.000000000 -0400
    22154@@ -40,7 +40,7 @@
    23155 
    24156 # kde_cfg_DATA = superkaramba.kcfg
    … …  
    28160 #superkaramba_LDADD = -lkio $(LIB_KDEUI) $(XMMS_LDADD) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
    29161 superkaramba_LDADD = -lkio $(LIB_KDEUI) $(XMMS_LIBS) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
    30162 
    31 --- kdeutils-3.5.0/superkaramba/configure.in.in 2005-10-10 10:59:13.000000000 -0400
    32 +++ kdeutils-3.5.0-new/superkaramba/configure.in.in     2006-01-16 22:24:41.000000000 -0500
    33 @@ -71,3 +71,5 @@
    34  if test -z "$PYTHONINC" ; then
    35          DO_NOT_COMPILE="$DO_NOT_COMPILE superkaramba"
    36  fi
    37 +
    38 +AC_CHECK_HEADERS(netinet/in.h sys/sockio.h)
    39 --- kdeutils-3.5.0/superkaramba/src/misc_python.cpp     2005-11-19 05:02:57.000000000 -0500
    40 +++ kdeutils-3.5.0-new/superkaramba/src/misc_python.cpp 2006-01-16 22:25:28.000000000 -0500
    41 @@ -425,10 +425,10 @@
     163--- kdeutils-3.5.4/superkaramba/src/misc_python.cpp     2006-03-17 05:13:37.000000000 -0500
     164+++ kdeutils-3.5.4-new/superkaramba/src/misc_python.cpp 2006-08-01 23:42:11.000000000 -0400
     165@@ -617,10 +617,10 @@
    42166 #include <sys/ioctl.h>
    43167 #include <net/if.h>
    44168 #include <arpa/inet.h>
    … …  
    51175 #include <sys/sockio.h>
    52176 #endif
    53177 /* now a method we need to expose to Python */
     178--- kdeutils-3.5.4/superkaramba/src/misc_python.cpp.orig        1969-12-31 19:00:00.000000000 -0500
     179+++ kdeutils-3.5.4-new/superkaramba/src/misc_python.cpp.orig    2006-03-17 05:13:37.000000000 -0500
     180@@ -0,0 +1,800 @@
     181+/****************************************************************************
     182+*  misc_python.cpp  -  Misc Functions for python api
     183+*
     184+*  Copyright (C) 2003 Hans Karlsson <karlsson.h@home.se>
     185+*  Copyright (C) 2003-2004 Adam Geitgey <adam@rootnode.org>
     186+*  Copyright (C) 2004 Petri Damst� <damu@iki.fi>
     187+*  Copyright (C) 2004, 2005 Luke Kenneth Casson Leighton <lkcl@lkcl.net>
     188+*
     189+*  This file is part of SuperKaramba.
     190+*
     191+*  SuperKaramba is free software; you can redistribute it and/or modify
     192+*  it under the terms of the GNU General Public License as published by
     193+*  the Free Software Foundation; either version 2 of the License, or
     194+*  (at your option) any later version.
     195+*
     196+*  SuperKaramba is distributed in the hope that it will be useful,
     197+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
     198+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     199+*  GNU General Public License for more details.
     200+*
     201+*  You should have received a copy of the GNU General Public License
     202+*  along with SuperKaramba; if not, write to the Free Software
     203+*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
     204+****************************************************************************/
     205+
     206+#ifdef _XOPEN_SOURCE
     207+#undef _XOPEN_SOURCE
     208+#endif
     209+
     210+#include <Python.h>
     211+#include <qglobal.h>
     212+#include <qobject.h>
     213+#include "kdebug.h"
     214+#include "karamba.h"
     215+#include "karambaapp.h"
     216+#include "themefile.h"
     217+#include "themelocale.h"
     218+#include "meter.h"
     219+#include "meter_python.h"
     220+#include "misc_python.h"
     221+
     222+/* now a method we need to expose to Python */
     223+long acceptDrops(long widget)
     224+{
     225+  karamba* currTheme = (karamba*)widget;
     226+
     227+  currTheme->setAcceptDrops(true);
     228+
     229+  return 1;
     230+}
     231+
     232+PyObject* py_accept_drops(PyObject *, PyObject *args)
     233+{
     234+  long widget;
     235+
     236+  if (!PyArg_ParseTuple(args, (char*)"l", &widget))
     237+    return NULL;
     238+  if (!checkKaramba(widget))
     239+    return NULL;
     240+  return Py_BuildValue((char*)"l", acceptDrops(widget));
     241+}
     242+
     243+// Runs a command, returns 0 if it could not start command
     244+PyObject* py_run_command(PyObject*, PyObject* args)
     245+{
     246+  char* name;
     247+  char* command;
     248+  char* icon;
     249+  PyObject *lst;
     250+  if (!PyArg_ParseTuple(args, (char*)"sssO:run", &name, &command, &icon, &lst) ||
     251+      lst == NULL || !PyList_Check(lst))
     252+      return NULL;
     253+
     254+  QString n;
     255+  QString c;
     256+  QString i;
     257+
     258+  n.setAscii(name);
     259+  c.setAscii(command);
     260+  i.setAscii(icon);
     261+
     262+  KService svc(n, c, i);
     263+  KURL::List l;
     264+
     265+  for (int i = 0; i < PyList_Size(lst); i++)
     266+  {
     267+    l.append(PyString2QString(PyList_GetItem(lst, i)));
     268+  }
     269+  KRun::run(svc, l);
     270+  return Py_BuildValue("l", 1);
     271+}
     272+
     273+// Runs a command, returns 0 if it could not start command
     274+PyObject* py_execute_command(PyObject *, PyObject* args)
     275+{
     276+  PyObject* s;
     277+
     278+  if (!PyArg_ParseTuple(args, (char*)"O:execute", &s))
     279+      return NULL;
     280+  return Py_BuildValue((char*)"l", KRun::runCommand(PyString2QString(s)));
     281+}
     282+
     283+// Runs a command, returns 0 if it could not start command
     284+PyObject* py_execute_command_interactive(PyObject *, PyObject* args)
     285+{
     286+  long widget;
     287+  //if (!PyArg_ParseTuple(args, (char*)"ls", &widget, &command))
     288+  //  return NULL;
     289+
     290+  int numLines;       /* how many lines we passed for parsing */
     291+  QString line;       /* pointer to the line as a string */
     292+
     293+  PyObject * listObj; /* the list of strings */
     294+  PyObject * strObj;  /* one string in the list */
     295+
     296+  /* the O! parses for a Python object (listObj) checked
     297+     to be of type PyList_Type */
     298+  if (! PyArg_ParseTuple(args, (char*)"lO!", &widget, &PyList_Type, &listObj))
     299+    return NULL;
     300+  if (!checkKaramba(widget))
     301+    return NULL;
     302+
     303+  karamba* currTheme = (karamba*)widget;
     304+
     305+  currTheme->currProcess = new KProcess;
     306+
     307+  /* get the number of lines passed to us */
     308+  numLines = PyList_Size(listObj);
     309+
     310+  /* should raise an error here. */
     311+  if (numLines < 0) return NULL; /* Not a list */
     312+
     313+  /* iterate over items of the list, grabbing strings, and parsing
     314+     for numbers */
     315+  for (int i=0; i<numLines; i++){
     316+
     317+    /* grab the string object from the next element of the list */
     318+    strObj = PyList_GetItem(listObj, i); /* Can't fail */
     319+
     320+    /* make it a string */
     321+    line = PyString2QString(strObj);
     322+
     323+    /* now do the parsing */
     324+    *(currTheme->currProcess) << line;
     325+
     326+  }
     327+  QApplication::connect(currTheme->currProcess,
     328+                        SIGNAL(processExited(KProcess *)),
     329+                        currTheme,
     330+                        SLOT(processExited(KProcess *)));
     331+  QApplication::connect(currTheme->currProcess,
     332+                        SIGNAL(receivedStdout(KProcess *, char *, int)),
     333+                        currTheme,
     334+                        SLOT(receivedStdout(KProcess *, char *, int)));
     335+  currTheme->currProcess->start(KProcess::NotifyOnExit, KProcess::Stdout);
     336+
     337+  return Py_BuildValue((char*)"l", (int)(currTheme->currProcess->pid()));
     338+}
     339+
     340+long attachClickArea(long widget, long meter, QString LeftButton, QString MiddleButton, QString RightButton)
     341+{
     342+  karamba* currTheme = (karamba*) widget;
     343+  Meter* currMeter = (Meter*) meter;
     344+
     345+  // Look if currMeter has an ClickArea attached.
     346+  bool meterAlreadyClickable = currTheme->clickList->containsRef(currMeter);
     347+
     348+  // if currMeter is of type ImageLabel*
     349+  if (ImageLabel* image = dynamic_cast<ImageLabel*>(currMeter))
     350+  {
     351+      image -> attachClickArea(LeftButton, MiddleButton, RightButton);
     352+      if (!meterAlreadyClickable)
     353+      {
     354+          //qWarning("attachClickArea : meter is image");
     355+          currTheme -> clickList -> append(image);
     356+      }
     357+  }
     358+  // else if currMeter is of type TextLabel*
     359+  else if (TextLabel* text = dynamic_cast<TextLabel*>(currMeter))
     360+  {
     361+      text -> attachClickArea(LeftButton, MiddleButton, RightButton);
     362+      if (!meterAlreadyClickable)
     363+      {
     364+          //qWarning("attachClickArea : meter is text");
     365+          currTheme -> clickList -> append(text);
     366+      }
     367+  }
     368+  else
     369+  {
     370+      //The given meter does not support attached clickAreas.
     371+      qWarning("The given meter is not of type image or text");
     372+      return 0;
     373+  }
     374+  return 1;
     375+}
     376+
     377+PyObject* py_attach_clickArea(PyObject*, PyObject* args, PyObject* dict)
     378+{
     379+  long widget;
     380+  long meter;
     381+  char* LeftButton = NULL;
     382+  char* MiddleButton = NULL;
     383+  char* RightButton = NULL;
     384+  const char* mouseButtons[] = {"Widget", "Meter", "LeftButton", "MiddleButton",
     385+                                "RightButton", NULL};
     386+  if (!PyArg_ParseTupleAndKeywords(args, dict, (char*)"ll|sss:attachClickArea",
     387+   (char**)mouseButtons, &widget, &meter, &LeftButton, &MiddleButton, &RightButton))
     388+    return NULL;
     389+  if (!checkKaramba(widget))
     390+    return NULL;
     391+  QString lB, mB, rB;
     392+  if (LeftButton != NULL)
     393+  {
     394+      lB.setAscii(LeftButton);
     395+  }
     396+  else
     397+  {
     398+      lB.setAscii("");
     399+  }
     400+  if (MiddleButton != NULL)
     401+  {
     402+      mB.setAscii(MiddleButton);
     403+  }
     404+  else
     405+  {
     406+      mB.setAscii("");
     407+  }
     408+  if (RightButton != NULL)
     409+  {
     410+       rB.setAscii(RightButton);
     411+  }
     412+  else
     413+  {
     414+       rB.setAscii("");
     415+  }
     416+  return Py_BuildValue((char*)"l", attachClickArea(widget, meter, lB, mB, rB));
     417+}
     418+
     419+/* now a method we need to expose to Python */
     420+long toggleShowDesktop(long)
     421+{
     422+  ShowDesktop *s = ShowDesktop::the();
     423+  s->toggle();
     424+  return 1;
     425+}
     426+
     427+PyObject* py_toggle_show_desktop(PyObject *, PyObject *args)
     428+{
     429+  long widget;
     430+  if (!PyArg_ParseTuple(args, (char*)"l:toggleShowDesktop", &widget))
     431+    return NULL;
     432+  if (!checkKaramba(widget))
     433+    return NULL;
     434+  return Py_BuildValue((char*)"l", toggleShowDesktop(widget));
     435+}
     436+
     437+/* now a method we need to expose to Python */
     438+const char* getPrettyName(long widget) {
     439+  karamba* currTheme = (karamba*)widget;
     440+
     441+  return currTheme->prettyName.ascii();
     442+}
     443+
     444+PyObject* py_get_pretty_name(PyObject *, PyObject *args)
     445+{
     446+  long widget;
     447+  if (!PyArg_ParseTuple(args, (char*)"l:getPrettyThemeName", &widget))
     448+    return NULL;
     449+  return Py_BuildValue((char*)"s", getPrettyName(widget));
     450+}
     451+
     452+/* now a method we need to expose to Python */
     453+const char* getThemePath(long widget) {
     454+  karamba* currTheme = (karamba*)widget;
     455+
     456+  return currTheme->theme().path().ascii();
     457+}
     458+
     459+PyObject* py_get_theme_path(PyObject *, PyObject *args)
     460+{
     461+  long widget;
     462+  if (!PyArg_ParseTuple(args, (char*)"l:getThemePath", &widget))
     463+    return NULL;
     464+  if (!checkKaramba(widget))
     465+    return NULL;
     466+  return Py_BuildValue((char*)"s", getThemePath(widget));
     467+}
     468+
     469+PyObject* py_language(PyObject *, PyObject *args)
     470+{
     471+  long widget;
     472+  if (!PyArg_ParseTuple(args, (char*)"l:language", &widget))
     473+    return NULL;
     474+  if (!checkKaramba(widget))
     475+    return NULL;
     476+  return Py_BuildValue((char*)"s",
     477+      ((karamba*)widget)->theme().locale()->language().ascii());
     478+}
     479+
     480+PyObject* py_read_theme_file(PyObject *, PyObject *args)
     481+{
     482+  long widget;
     483+  char *file;
     484+  if (!PyArg_ParseTuple(args, (char*)"ls:readThemeFile", &widget, &file))
     485+    return NULL;
     486+  if (!checkKaramba(widget))
     487+    return NULL;
     488+  karamba* k = (karamba*)widget;
     489+  QByteArray ba = k->theme().readThemeFile(file);
     490+  return PyString_FromStringAndSize(ba.data(), ba.size());
     491+}
     492+
     493+/* now a method we need to expose to Python */
     494+long removeClickArea(long widget, long click) {
     495+
     496+  karamba* currTheme = (karamba*)widget;
     497+  ClickArea *tmp = (ClickArea*)click;
     498+
     499+  currTheme -> clickList -> remove(tmp);
     500+
     501+  delete tmp;
     502+  return (long)tmp;
     503+}
     504+
     505+/* now a method we need to expose to Python */
     506+long createServiceClickArea(long widget, long x, long y, long w, long h, char *name, char* exec, char *icon) {
     507+
     508+  karamba* currTheme = (karamba*)widget;
     509+  ClickArea *tmp = new ClickArea( currTheme, x, y, w, h );
     510+  QString n;
     511+  QString e;
     512+  QString i;
     513+
     514+  n.setAscii(name);
     515+  e.setAscii(exec);
     516+  i.setAscii(icon);
     517+
     518+  tmp->setServiceOnClick(n, e, i);
     519+
     520+  currTheme -> clickList -> append(tmp);
     521+  return (long)tmp;
     522+}
     523+
     524+long createClickArea(long widget, long x, long y, long w, long h, char* text) {
     525+
     526+  karamba* currTheme = (karamba*)widget;
     527+  ClickArea *tmp = new ClickArea(currTheme, x, y, w, h );
     528+  QString onclick;
     529+
     530+  onclick.setAscii(text);
     531+
     532+  tmp->setOnClick(onclick );
     533+
     534+  currTheme -> clickList -> append(tmp);
     535+  return (long)tmp;
     536+}
     537+
     538+PyObject* py_remove_click_area(PyObject *, PyObject *args)
     539+{
     540+  long widget, click;
     541+  if (!PyArg_ParseTuple(args, (char*)"ll:removeClickArea", &widget, &click))
     542+    return NULL;
     543+  return Py_BuildValue((char*)"l", removeClickArea(widget, click));
     544+}
     545+
     546+PyObject* py_create_service_click_area(PyObject *, PyObject *args)
     547+{
     548+  long widget, x, y, w, h;
     549+  char *name;
     550+  char *exec;
     551+  char *icon;
     552+  if (!PyArg_ParseTuple(args, (char*)"lllllsss:createServiceClickArea", &widget, &x, &y,
     553+                        &w, &h, &name, &exec, &icon))
     554+    return NULL;
     555+  return Py_BuildValue((char*)"l", createServiceClickArea(widget, x, y, w, h, name, exec, icon));
     556+}
     557+
     558+PyObject* py_create_click_area(PyObject *, PyObject *args)
     559+{
     560+  long widget, x, y, w, h;
     561+  char *text;
     562+  if (!PyArg_ParseTuple(args, (char*)"llllls:createClickArea", &widget, &x, &y,
     563+                        &w, &h, &text))
     564+    return NULL;
     565+  if (!checkKaramba(widget))
     566+    return NULL;
     567+  return Py_BuildValue((char*)"l", createClickArea(widget, x, y, w, h, text));
     568+}
     569+
     570+static long callTheme(long widget, char* path, char *str)
     571+{
     572+  karamba* currTheme = (karamba*) widget;
     573+
     574+  if (currTheme)
     575+    currTheme->callTheme(QString(path), QString(str));
     576+
     577+  return (long)currTheme;
     578+}
     579+
     580+static long setIncomingData(long widget, char* path, char *obj)
     581+{
     582+  karamba* currTheme = (karamba*) widget;
     583+
     584+  if (currTheme)
     585+    currTheme->setIncomingData(QString(path), QString(obj));
     586+
     587+  return (long)currTheme;
     588+}
     589+
     590+static QString getIncomingData(long widget)
     591+{
     592+  karamba* currTheme = (karamba*) widget;
     593+
     594+  if (currTheme)
     595+    return currTheme->getIncomingData();
     596+
     597+  return QString("");
     598+}
     599+
     600+/*
     601+ * openNamedTheme.  this function checks to see whether the theme
     602+ * being opened is unique or not (against all running karamba widgets).
     603+ * this is important, as loading themes with the same name causes
     604+ * grief.
     605+ */
     606+long openNamedTheme(char* path, char *name, bool is_sub_theme) {
     607+
     608+  QString filename;
     609+  karamba* currTheme = 0;
     610+
     611+  filename.setAscii(path);
     612+
     613+  QFileInfo file( filename );
     614+
     615+  if( file.exists() )
     616+  {
     617+      QCString prettyName(name);
     618+      KarambaApplication* app = (KarambaApplication*)qApp;
     619+      if (!app->themeExists(prettyName))
     620+      {
     621+        currTheme = new karamba( filename, prettyName, false ,
     622+                   -1, is_sub_theme);
     623+      currTheme->show();
     624+    }
     625+  }
     626+  return (long)currTheme;
     627+}
     628+
     629+/* now a method we need to expose to Python */
     630+long openTheme(char* path)
     631+{
     632+
     633+  QString filename;
     634+  karamba* currTheme = 0;
     635+
     636+  filename.setAscii(path);
     637+
     638+  QFileInfo file( filename );
     639+
     640+  if( file.exists() )
     641+    {
     642+      currTheme = new karamba( filename, QString() );
     643+      currTheme->show();
     644+    }
     645+
     646+  return (long)currTheme;
     647+}
     648+
     649+PyObject* py_get_incoming_data(PyObject *, PyObject *args)
     650+{
     651+  long widget;
     652+  if (!PyArg_ParseTuple(args, (char*)"l:getIncomingData", &widget))
     653+    return NULL;
     654+  return Py_BuildValue((char*)"O", QString2PyString(getIncomingData(widget)));
     655+}
     656+
     657+PyObject* py_set_incoming_data(PyObject *, PyObject *args)
     658+{
     659+  char *themePath;
     660+  long widget;
     661+  char *obj;
     662+  if (!PyArg_ParseTuple(args, (char*)"lss:setIncomingData", &widget, &themePath, &obj))
     663+    return NULL;
     664+  return Py_BuildValue((char*)"l", setIncomingData(widget, themePath, obj));
     665+}
     666+
     667+PyObject* py_call_theme(PyObject *, PyObject *args)
     668+{
     669+  char *themePath;
     670+  char *str;
     671+  long widget;
     672+  if (!PyArg_ParseTuple(args, (char*)"lss:callTheme", &widget, &themePath, &str))
     673+    return NULL;
     674+  return Py_BuildValue((char*)"l", callTheme(widget, themePath, str));
     675+}
     676+
     677+PyObject* py_open_named_theme(PyObject *, PyObject *args)
     678+{
     679+  char *themePath;
     680+  char *themeName;
     681+  long is_sub_theme;
     682+  if (!PyArg_ParseTuple(args, (char*)"ssl:openNamedTheme", &themePath, &themeName, &is_sub_theme))
     683+    return NULL;
     684+  return Py_BuildValue((char*)"l", openNamedTheme(themePath, themeName, is_sub_theme ? true : false));
     685+}
     686+
     687+PyObject* py_open_theme(PyObject *, PyObject *args)
     688+{
     689+  char *themePath;
     690+  if (!PyArg_ParseTuple(args, (char*)"s:openTheme", &themePath))
     691+    return NULL;
     692+  return Py_BuildValue((char*)"l", openTheme(themePath));
     693+}
     694+
     695+PyObject* py_reload_theme(PyObject *, PyObject *args)
     696+{
     697+  long widget;
     698+  if (!PyArg_ParseTuple(args, (char*)"l:reloadTheme", &widget))
     699+    return NULL;
     700+  if (!checkKaramba(widget))
     701+    return NULL;
     702+  ((karamba*)widget)->reloadConfig();
     703+  return Py_BuildValue((char*)"l", 1);
     704+}
     705+
     706+/* now a method we need to expose to Python */
     707+int getNumberOfDesktops(long widget)
     708+{
     709+  karamba* currTheme = (karamba*)widget;
     710+
     711+  return currTheme->kWinModule->numberOfDesktops();
     712+}
     713+
     714+PyObject* py_get_number_of_desktops(PyObject *, PyObject *args)
     715+{
     716+  long widget;
     717+  if (!PyArg_ParseTuple(args, (char*)"l:getNumberOfDesktops", &widget))
     718+    return NULL;
     719+  if (!checkKaramba(widget))
     720+    return NULL;
     721+  return Py_BuildValue((char*)"l", getNumberOfDesktops(widget));
     722+}
     723+
     724+/* now a method we need to expose to Python */
     725+int translateAll(long widget, int x, int y)
     726+{
     727+  karamba* currTheme = (karamba*)widget;
     728+
     729+  QObjectListIt it2( *currTheme->meterList ); // iterate over meters
     730+
     731+  while ( it2 != 0 )
     732+  {
     733+    ((Meter*) *it2)->setSize(((Meter*) *it2)->getX()+x,
     734+                             ((Meter*) *it2)->getY()+y,
     735+                             ((Meter*) *it2)->getWidth(),
     736+                             ((Meter*) *it2)->getHeight());
     737+    ++it2;
     738+  }
     739+
     740+  if (currTheme->systray != 0)
     741+  {
     742+    currTheme->systray->move(currTheme->systray->x()+x,
     743+                             currTheme->systray->y()+y);
     744+  }
     745+  return 0;
     746+}
     747+
     748+PyObject* py_translate_all(PyObject *, PyObject *args)
     749+{
     750+  long widget;
     751+  int x, y;
     752+  if (!PyArg_ParseTuple(args, (char*)"lii:translateAll", &widget, &x, &y))
     753+    return NULL;
     754+  if (!checkKaramba(widget))
     755+    return NULL;
     756+  return Py_BuildValue((char*)"lii", translateAll(widget, x, y));
     757+}
     758+
     759+/* now a method we need to expose to Python */
     760+int show(long widget)
     761+{
     762+  karamba* currTheme = (karamba*)widget;
     763+  currTheme->show();
     764+  return 0;
     765+}
     766+
     767+PyObject* py_show(PyObject *, PyObject *args)
     768+{
     769+  long widget;
     770+  if (!PyArg_ParseTuple(args, (char*)"l:show", &widget))
     771+    return NULL;
     772+  if (!checkKaramba(widget))
     773+    return NULL;
     774+  return Py_BuildValue((char*)"l", show(widget));
     775+}
     776+
     777+/* now a method we need to expose to Python */
     778+int hide(long widget)
     779+{
     780+  karamba* currTheme = (karamba*)widget;
     781+  currTheme->hide();
     782+  return 0;
     783+}
     784+
     785+PyObject* py_hide(PyObject *, PyObject *args)
     786+{
     787+  long widget;
     788+  if (!PyArg_ParseTuple(args, (char*)"l:hide", &widget))
     789+    return NULL;
     790+  if (!checkKaramba(widget))
     791+    return NULL;
     792+  return Py_BuildValue((char*)"l", hide(widget));
     793+}
     794+
     795+/*Putting includes here to show the dependency for the call(s) below (if we ever decide to move the networking callbacks into a separate file*/
     796+#include <sys/socket.h>
     797+#include <sys/ioctl.h>
     798+#include <net/if.h>
     799+#include <arpa/inet.h>
     800+#ifdef __FreeBSD__
     801+#include <netinet/in.h>
     802+#endif
     803+#if defined(Q_OS_SOLARIS)
     804+#include <sys/sockio.h>
     805+#endif
     806+/* now a method we need to expose to Python */
     807+QString getIp(char *device_name)
     808+{
     809+  int i, sd, numdevs;
     810+  struct ifconf ifc_conf;
     811+  char ifc_conf_buf[sizeof ( struct ifreq ) * 32];
     812+  struct ifreq *devptr;
     813+  int ifc_conf_buf_size;
     814+  static struct in_addr host;
     815+  QString retval;
     816+
     817+  retval = "Disconnected";
     818+
     819+  /*
     820+   * Open a socket, any type will do so we choose UDP, and ask it with
     821+   * an ioctl call what devices are behind it.
     822+   */
     823+  if ((sd = socket(AF_INET,SOCK_DGRAM,0)) < 0)
     824+  {
     825+    qWarning("Error: Unable to create socket (socket)");
     826+    return "Error";
     827+  }
     828+
     829+  /*
     830+   * Fill the buffer with our static buffer, probably big enough, and get
     831+   * the interface configuration.
     832+   */
     833+  ifc_conf_buf_size = sizeof ifc_conf_buf;
     834+  ifc_conf.ifc_len = ifc_conf_buf_size;
     835+  ifc_conf.ifc_buf = ifc_conf_buf;
     836+  if (ioctl(sd,SIOCGIFCONF,&ifc_conf) < 0)
     837+  {
     838+    qWarning("Error: Unable to get network interface conf (ioctl)");
     839+    close(sd);
     840+    return "Error";
     841+  }
     842+
     843+  /*
     844+   * An array of devices were returned.  Which ones are up right now and
     845+   * have broadcast capability?
     846+   */
     847+  numdevs = ifc_conf.ifc_len / sizeof (struct ifreq);
     848+  //qDebug("numdevs = %d", numdevs);
     849+  for (i = 0; i < numdevs; i++)
     850+  {
     851+    //qDebug("iterations: %d", i);
     852+    /* devptr points into an array of ifreq structs. */
     853+    devptr = &ifc_conf.ifc_req[i];
     854+
     855+    if (ioctl(sd, SIOCGIFADDR, devptr) < 0 || devptr->ifr_addr.sa_family != AF_INET)
     856+      continue;
     857+
     858+    if (ioctl(sd,SIOCGIFFLAGS,devptr) < 0)
     859+    {
     860+      qWarning("Error: Unable to get device interface flags (ioctl).");
     861+      close(sd);
     862+      return "Error";
     863+    }
     864+
     865+  //We generally don't want probing of the loopback devices
     866+  if ((devptr->ifr_flags & IFF_LOOPBACK) != 0)
     867+   continue;
     868+
     869+    if ((devptr->ifr_flags & IFF_UP) == 0)
     870+    continue;
     871+
     872+    if ((devptr->ifr_flags & IFF_BROADCAST) == 0)
     873+    continue;
     874+
     875+  /* Get the broadcast address. */
     876+  if (ioctl(sd,SIOCGIFFLAGS,devptr) < 0)
     877+  {
     878+    qWarning("Error: Unable to get device interface flags (ioctl).");
     879+    close(sd);
     880+    return "Error";
     881+  }
     882+  else
     883+  {
     884+    if (!strcmp((char*)devptr->ifr_name, device_name))
     885+    {
     886+    host.s_addr = ((struct sockaddr_in*)&devptr->ifr_addr)->sin_addr.s_addr;
     887+    retval = inet_ntoa(host);
     888+    break;
     889+    }
     890+  }
     891+  }
     892+  close(sd);
     893+  return retval;
     894+}
     895+
     896+PyObject* py_set_update_time(PyObject *, PyObject *args)
     897+{
     898+  long widget;
     899+  double time;
     900+  if (!PyArg_ParseTuple(args, (char*)"ld:setUpdateTime", &widget, &time))
     901+    return NULL;
     902+  karamba* currTheme = (karamba*)widget;
     903+  currTheme->setUpdateTime(time);
     904+  return Py_BuildValue((char*)"l", 1);
     905+}
     906+
     907+PyObject* py_get_update_time(PyObject *, PyObject *args)
     908+{
     909+  long widget;
     910+  double time;
     911+  if (!PyArg_ParseTuple(args, (char*)"l:getUpdateTime", &widget, &time))
     912+    return NULL;
     913+  karamba* currTheme = (karamba*)widget;
     914+  return Py_BuildValue((char*)"d", currTheme->getUpdateTime());
     915+}
     916+
     917+PyObject* py_get_ip(PyObject *, PyObject *args)
     918+{
     919+  long widget;
     920+  char *interface;
     921+  if (!PyArg_ParseTuple(args, (char*)"ls:getIp", &widget, &interface))
     922+    return NULL;
     923+  if (!checkKaramba(widget))
     924+    return NULL;
     925+  return Py_BuildValue((char*)"O", QString2PyString(getIp(interface)));
     926+}
     927+
     928+static void management_popup(long widget)
     929+{
     930+  karamba* currTheme = (karamba*)widget;
     931+  currTheme->management_popup();
     932+}
     933+
     934+PyObject* py_management_popup(PyObject *, PyObject *args)
     935+{
     936+  long widget;
     937+  if (!PyArg_ParseTuple(args, (char*)"l:managementPopup", &widget))
     938+    return NULL;
     939+  if (!checkKaramba(widget))
     940+    return NULL;
     941+  management_popup(widget);
     942+  return Py_BuildValue((char*)"l", 1);
     943+}
     944+
     945+static void set_want_right_button(long widget, long yesno)
     946+{
     947+  karamba* currTheme = (karamba*)widget;
     948+  currTheme->setWantRightButton(yesno);
     949+}
     950+
     951+PyObject* py_want_right_button(PyObject *, PyObject *args)
     952+{
     953+  long widget, i;
     954+  if (!PyArg_ParseTuple(args, (char*)"ll:wantRightButton", &widget, &i))
     955+    return NULL;
     956+  if (!checkKaramba(widget))
     957+    return NULL;
     958+  set_want_right_button(widget, i);
     959+  return Py_BuildValue((char*)"l", 1);
     960+}
     961+
     962+
     963+static void changeInterval(long widget, long interval)
     964+{
     965+  karamba* currTheme = (karamba*)widget;
     966+  currTheme->changeInterval(interval);
     967+}
     968+
     969+PyObject* py_change_interval(PyObject *, PyObject *args)
     970+{
     971+  long widget, i;
     972+  if (!PyArg_ParseTuple(args, (char*)"ll:changeInterval", &widget, &i))
     973+    return NULL;
     974+  if (!checkKaramba(widget))
     975+    return NULL;
     976+  changeInterval(widget, i);
     977+  return Py_BuildValue((char*)"l", 1);
     978+}
     979+
     980+

  • kdeutils3/files/CompileScript.sh

     
    11#!/bin/sh -e
    22
    3         export HOME=/tmp
    4         export PREFIX="%p"
     3        export PREFIX="%p" USE_UNSERMAKE=1
    54        . ./environment-helper.sh
    6         export lt_cv_sys_max_cmd_len=65536
    75
    8 #darwinports
    9         export UNSERMAKE="no"
    10 
    11         export CC=gcc CXX=g++
    12 
    136        ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
    147        ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
    15         perl -pi.bak -e 's, kgpg , ,' Makefile
    16         ./build-helper.sh make      %N %v %r make all all_libraries="$ALL_LIBRARIES"
     8        perl -pi -e 's, kgpg , ,' Makefile
     9        ./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS

  • kdeutils3/Portfile

     
    11# $Id$
    22
    3 #Synced with Fink, Version 3.5.1-1023
     3#Synced with Fink, Version 3.5.4-1021
    44
    55PortSystem 1.0
    66name            kdeutils3
    7 version         3.5.1
    8 revision        1
    9 set kdeadmin    kde-admindir-3.5.1
     7version         3.5.4
     8set kdeadmin    kde-admindir-252
    109categories      kde
    1110maintainers     ben@macports.org takanori@macports.org
    1211description     KDE utilities. \
    13                 NB No KDE sound support.
     12                NB No KDE sound support.
    1413platforms       darwin
    15 master_sites    opendarwin::kde351 \
     14master_sites    opendarwin::kde354 \
    1615                opendarwin::admin
    1716#               kde:stable/${version}/src
    1817#               http://ranger.befunk.com/fink/:admin
    19 extract.suffix  .tar.bz2
    2018use_bzip2       yes
    2119distname        kdeutils-${version}
    22 distfiles       ${distname}.tar.bz2:kde351 \
     20distfiles       ${distname}.tar.bz2:kde354 \
    2321                ${kdeadmin}.tar.bz2:admin
    2422depends_build   port:autoconf \
    25                 port:automake
    26 depends_lib     port:kdebase3 \
    27                 port:gmp
     23                port:unsermake
     24depends_lib     port:gmp \
     25                port:kdebase3
    2826#               port:python24
     27#               port:xmms
    2928
    30 checksums       ${distname}.tar.bz2 md5 1286c6a09b04452adfe492de2fad79bd \
    31                 ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
     29checksums       ${distname}.tar.bz2 md5 e24cd91576db3d2414fb30cab47e44e5 \
     30                ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
    3231
    33 extract.only ${distname}.tar.bz2
    34 post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
     32extract.only    ${distname}.tar.bz2
     33post-extract    { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
    3534
    3635patchfiles      kdeutils3.patch
    3736patch           {
    3837                cd ${worksrcpath}
    3938                foreach file $patchfiles {
    40                     system "sed -e 's,@FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
     39                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
    4140                }
     41                system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' admin/*"
    4242}
    43 post-patch      {
    44                 reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
    45                 reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
     43post-patch      {
     44                reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
    4645                reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
    47                 reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
    48                 foreach file [glob ${worksrcpath}/admin/*] {
    49                     reinplace "s|-O2|-Os|g" $file
    50                     reinplace "s|doc/HTML|doc/kde|g" $file
    51                     reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
    52                 }
    5346                foreach file {CompileScript.sh InstallScript.sh} {
    54                     file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
     47                    file copy ${filespath}/${file} ${worksrcpath}
    5548                    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
    5649                    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
    5750                    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
    … …  
    6356                }
    6457                # disable ksim which depends on net-snmp which doesn't build
    6558                # on Mac OS 10.4
    66                 file delete -force ${worksrcpath}/ksim
     59                delete ${worksrcpath}/ksim
    6760}
    6861
    69 configure.args  --with-distribution='DarwinPorts/Mac OS X' --without-arts
     62configure.args  --with-distribution='MacPorts/Mac OS X' --without-arts
    7063
    7164configure       {}
    7265build           { system "cd ${worksrcpath} && ./CompileScript.sh" }
    7366destroot        { system "cd ${worksrcpath} && ./InstallScript.sh" }
    7467
    75 post-destroot   {
     68post-destroot   {
    7669                xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
    7770                xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING INSTALL README ${destroot}${prefix}/share/doc/${name}
    7871}
    79 
    80 platform darwin 6 {
    81         depends_lib-append      lib:libdl:dlcompat
    82 }

  • kdewebdev3/files/InstallScript.sh

     
    11#!/bin/sh -e
    22
    3         export PREFIX="%p"
     3        export PREFIX="%p" USE_UNSERMAKE=1
    44        . ./environment-helper.sh
    55
    6 #darwinports
    7         export UNSERMAKE="no"
     6        ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
    87
    9         ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
    10 
    118        mkdir -p %i/share/doc/installed-packages
    129        touch %i/share/doc/installed-packages/%N
    1310        touch %i/share/doc/installed-packages/%N-base

  • kdewebdev3/files/CompileScript.sh

     
    11#!/bin/sh -e
    22
    3         export HOME=/tmp
    4         export PREFIX="%p"
     3        export PREFIX="%p" USE_UNSERMAKE=1
    54        . ./environment-helper.sh
    6         export lt_cv_sys_max_cmd_len=65536
    75
    8 #darwinports
    9         export UNSERMAKE="no"
    10 
    11         export CC=gcc CXX=g++
    12 
    136        ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
    147        ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
    15         ./build-helper.sh make      %N %v %r make all all_libraries="$ALL_LIBRARIES"
     8        ./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS

  • kdewebdev3/Portfile

     
    11# $Id$
    22
    3 #Synced with Fink, Version 3.5.1-1023
     3#Synced with Fink, Version 3.5.4-1021
    44
    55PortSystem 1.0
    66name            kdewebdev3
    7 version         3.5.1
    8 revision        2
    9 set kdeadmin    kde-admindir-3.5.1
     7version         3.5.4
     8set kdeadmin    kde-admindir-252
    109categories      kde
    1110maintainers     ben@macports.org takanori@macports.org
    1211description     KDE web development tools. \
    1312                NB No KDE sound support.
    1413platforms       darwin
    15 master_sites    opendarwin::kde351 \
     14master_sites    opendarwin::kde354 \
    1615                opendarwin::admin
    1716#               kde:stable/${version}/src
    1817#               http://ranger.befunk.com/fink/:admin
    19 extract.suffix  .tar.bz2
    2018use_bzip2       yes
    2119distname        kdewebdev-${version}
    22 distfiles       ${distname}.tar.bz2:kde351 \
     20distfiles       ${distname}.tar.bz2:kde354 \
    2321                ${kdeadmin}.tar.bz2:admin
    2422depends_build   port:autoconf \
    25                 port:automake
    26 depends_lib     port:kdebase3 \
    27                 port:libgcrypt
     23                port:unsermake
     24depends_lib     port:kdebase3
    2825
    29 checksums       ${distname}.tar.bz2 md5 0faea4e8088005ae60f58b21c60b32ea \
    30                 ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
     26checksums       ${distname}.tar.bz2 md5 310a40555c089e88cc5ff7620a89b444 \
     27                ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
    3128
    32 extract.only ${distname}.tar.bz2
    33 post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
     29extract.only    ${distname}.tar.bz2
     30post-extract    { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
    3431
    3532patchfiles     
    3633patch           {
    3734                cd ${worksrcpath}
    3835                foreach file $patchfiles {
    39                     system "sed -e 's,@FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
     36                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
    4037                }
     38                system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' admin/*"
    4139}
    42 post-patch      {
    43                 reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
    44                 reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
     40post-patch      {
     41                reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
    4542                reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
    46                 reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
    47                 foreach file [glob ${worksrcpath}/admin/*] {
    48                     reinplace "s|-O2|-Os|g" $file
    49                     reinplace "s|doc/HTML|doc/kde|g" $file
    50                     reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
    51                 }
    5243                foreach file {CompileScript.sh InstallScript.sh} {
    53                     file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
     44                    file copy ${filespath}/${file} ${worksrcpath}
    5445                    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
    5546                    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
    5647                    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
    … …  
    6253                }
    6354}
    6455
    65 configure.args  --with-distribution='DarwinPorts/Mac OS X' --without-arts
     56configure.args  --with-distribution='MacPorts/Mac OS X' --without-arts
    6657
    6758configure       {}
    6859build           { system "cd ${worksrcpath} && ./CompileScript.sh" }
    6960destroot        { system "cd ${worksrcpath} && ./InstallScript.sh" }
    7061
    71 post-destroot   {
     62post-destroot   {
    7263                xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
    7364                xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING ChangeLog INSTALL README ${destroot}${prefix}/share/doc/${name}
    7465}
    75 
    76 platform darwin 6 {
    77         depends_lib-append      lib:libdl:dlcompat
    78 }
    79 

  • koffice/files/dp01.patch

     
    1 *** koffice-1.5.1/karbon/Makefile.am~   Thu May 11 03:35:25 2006
    2 --- koffice-1.5.1/karbon/Makefile.am    Mon May 22 20:38:02 2006
    3 ***************
    4 *** 30,36 ****
    5         $(LIBART_LIBS) \
    6         $(LIBFONTCONFIG_LIBS) \
    7         $(LIBMAGICK_LIBS) \
    8 !       $(LIBFREETYPE_LIBS)
    9  
    10   libkarbonpart_la_SOURCES = karbon_factory_init.cc
    11   libkarbonpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIBFREETYPE_RPATH)
    12 --- 30,37 ----
    13         $(LIBART_LIBS) \
    14         $(LIBFONTCONFIG_LIBS) \
    15         $(LIBMAGICK_LIBS) \
    16 !       $(LIBFREETYPE_LIBS) \
    17 !       $(LIB_X11)
    18  
    19   libkarbonpart_la_SOURCES = karbon_factory_init.cc
    20   libkarbonpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIBFREETYPE_RPATH)

  • koffice/files/InstallScript.sh

     
    11#!/bin/sh -e
    22
    3   export PREFIX="%p" UNSERMAKE=1
    4   . ./environment-helper.sh
     3        export PREFIX="%p" USE_UNSERMAKE=1
     4        . ./environment-helper.sh
    55
    6   ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR="%d"
     6        ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR="%d"
    77
    8   mkdir -p %i/share/doc/installed-packages
    9   touch %i/share/doc/installed-packages/%N
    10   touch %i/share/doc/installed-packages/%N-base
     8        mkdir -p %i/share/doc/installed-packages
     9        touch %i/share/doc/installed-packages/%N
     10        touch %i/share/doc/installed-packages/%N-base

  • koffice/files/CompileScript.sh

     
    11#!/bin/sh -e
    22
    3   export HOME=/tmp
    4   export PREFIX="%p" UNSERMAKE=1
     3        export PREFIX="%p" USE_UNSERMAKE=1
    54
    65#fink
    7 #  . ./environment-helper.sh
    8 #  export lt_cv_sys_max_cmd_len=65536 ac_cv_prog_RUBY=%p/bin/ruby1.8
    9 #  export CC=gcc CXX=g++ CONFIGURE_PARAMS=`echo $CONFIGURE_PARAMS | sed -e 's,--disable-dependency-tracking,,'`
    10 #darwinports
    11   . ./environment-helper.sh
    12   export lt_cv_sys_max_cmd_len=65536 ac_cv_prog_RUBY=%p/bin/ruby
    13   export CC=gcc CXX=g++ CONFIGURE_PARAMS=`echo $CONFIGURE_PARAMS | sed -e 's,--disable-dependency-tracking,,'`
     6#       . ./environment-helper.sh
     7#       export ac_cv_prog_RUBY=%p/bin/ruby1.8
     8#       export CONFIGURE_PARAMS=`echo $CONFIGURE_PARAMS | sed -e 's,--disable-dependency-tracking,,'`
     9#macports
     10        . ./environment-helper.sh
     11        export ac_cv_prog_RUBY=%p/bin/ruby
     12        export CONFIGURE_PARAMS=`echo $CONFIGURE_PARAMS | sed -e 's,--disable-dependency-tracking,,'`
    1413
    15   ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
    16   ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
     14        ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
     15        ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
    1716
    18   # why does this work??
    19   find . -name \*.h | xargs touch
     17        # why does this work??
     18        find . -name \*.h | xargs touch
    2019
    21   MAKEFLAGS="-j1" ./build-helper.sh make-drivers %N %v %r unsermake -p kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.la kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.la
    22   ./build-helper.sh make      %N %v %r unsermake -p
     20        MAKEFLAGS="-j1" ./build-helper.sh make-drivers %N %v %r unsermake $UNSERMAKEFLAGS kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.la kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.la
     21        ./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS

  • koffice/Portfile

     
    11# $Id$
    22
    3 #Synced with Fink, Version 1.5.1-1021
     3#Synced with Fink, Version 1.5.2-1023
    44
    55PortSystem 1.0
    66name            koffice
    7 version         1.5.1
    8 set kdeadmin    kde-admindir-full-3.5.2-2
     7version         1.5.2
     8set kdeadmin    kde-admindir-252
    99categories      kde
    1010maintainers     ben@macports.org takanori@macports.org
    1111description     KDE office suite. \
    12                 NB KDE sound does not work.
     12                NB KDE sound does not work.
    1313platforms       darwin
    14 master_sites    kde:stable/${name}-${version}/src \
    15                 http://ranger.befunk.com/fink/:admin \
     14master_sites    opendarwin::koffice152 \
     15                opendarwin::admin \
    1616                http://www.opendarwin.org/~takanori/mirror/${name}/${version}_${revision}/:patch
    17 extract.suffix  .tar.bz2
     17#               kde:stable/${name}-${version}/src
     18#               http://ranger.befunk.com/fink/:admin
    1819use_bzip2       yes
    1920distname        ${name}-${version}
    2021set distpatch   ${name}-${version}_${revision}-tiger.patch
    21 distfiles       ${distname}.tar.bz2 ${kdeadmin}.tar.bz2:admin ${distpatch}:patch
     22distfiles       ${distname}.tar.bz2:koffice152 \
     23                ${distpatch}:patch \
     24                ${kdeadmin}.tar.bz2:admin
    2225depends_build   port:autoconf \
    2326                port:unsermake
    2427depends_lib     port:kdebase3 \
    … …  
    3134#               port:python24 \ can't be found. looking for .so
    3235#               port:postgresql8 \ can't be found. looking for .so
    3336
    34 checksums       ${distname}.tar.bz2 md5 50897bd5dfd4eba8a0d78a02003a6ec9 \
    35                 ${kdeadmin}.tar.bz2 md5 b2afdafba2c416555105667c17046e32 \
    36                 ${name}-${version}_${revision}-panther.patch md5 4d368326b6c3302e717d5d42104ddbf1 \
    37                 ${name}-${version}_${revision}-tiger.patch md5 06740e27241092328bfbbe2168ca37cf
     37checksums       ${distname}.tar.bz2 md5 cbe9deeb7c811a6bb5a954989b25c1f2 \
     38                ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e \
     39                ${name}-${version}_${revision}-panther.patch md5 a2cd086e3d5706304399b43ef9e50780 \
     40                ${name}-${version}_${revision}-tiger.patch md5 4f567e63591b3c3cb04d972f5e589247
    3841
    39 extract.only ${distname}.tar.bz2
    40 post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
     42extract.only    ${distname}.tar.bz2
     43post-extract    { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
    4144
    42 patchfiles      dp01.patch
     45patchfiles     
    4346patch           {
    4447                cd ${worksrcpath}
    4548                system "sed -e 's,@FINKPREFIX@,${prefix},g' ${distpath}/${distpatch} | patch -p1"
    4649                foreach file $patchfiles {
    47                         system "sed -e 's,@FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
     50                        system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
    4851                }
     52                system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' admin/*"
    4953}
    50 post-patch      {
    51                 reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
    52                 reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
     54post-patch      {
     55                reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
    5356                reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
    54                 reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
    55                 foreach file [glob ${worksrcpath}/admin/*] {
    56                     reinplace "s|-O2|-Os|g" $file
    57                     reinplace "s|doc/HTML|doc/kde|g" $file
    58                     reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
    59                 }
    6057                foreach file {CompileScript.sh InstallScript.sh} {
    61                     file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
     58                    file copy ${filespath}/${file} ${worksrcpath}
    6259                    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
    6360                    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
    6461                    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
    … …  
    7067                }
    7168}
    7269
    73 configure.args --enable-mysql --with-distribution='DarwinPorts/Mac OS X' --without-arts
     70configure.args --enable-mysql --with-distribution='MacPorts/Mac OS X' --without-arts
    7471# (libpqxx is missing.)
    7572# --enable-pgsql --with-pgsqlincdir=${prefix}/include/pgsql8 --with-pgsqllibdir=${prefix}/lib/pgsql8 --with-pqxx-includes=${prefix}/include --with-pqxx-libraries=${prefix}/lib
    7673
    … …  
    7875build           { system "cd ${worksrcpath} && ./CompileScript.sh" }
    7976destroot        { system "cd ${worksrcpath} && ./InstallScript.sh" }
    8077
    81 post-destroot   {
     78post-destroot   {
    8279                xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
    8380                xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING COPYING.LIB INSTALL README ${destroot}${prefix}/share/doc/${name}
    8481}
    … …  
    8784                distfiles-delete        ${distpatch}:patch
    8885                set distpatch           ${name}-${version}_${revision}-panther.patch
    8986                distfiles-append        ${distpatch}:patch
    90                 post-patch {
    91 #                       if {[variant_isset with-ruby]} {
    92                         system "perl -pi -e \"s|-bundle|-bundle -bundle_loader /usr/lib/crt1.o|g\" ${worksrcpath}/admin/libtool.m4.in"
    93 #                       }
     87                post-patch      {
     88#                               if {[variant_isset with-ruby]} {
     89                                system "perl -pi -e \"s|-bundle|-bundle -bundle_loader /usr/lib/crt1.o|g\" ${worksrcpath}/admin/libtool.m4.in"
     90#                               }
    9491                }
    9592}
    96 
    97 #not tested on OSX 10.2.
    98 platform darwin 6 {
    99                 depends_lib-append      lib:libdl:dlcompat
    100                 distfiles-delete        ${distpatch}:patch
    101                 set distpatch           ${name}-${version}_${revision}-panther.patch
    102                 distfiles-append        ${distpatch}:patch
    103                 post-patch {
    104 #                       if {[variant_isset with-ruby]} {
    105                         system "perl -pi -e \"s|-bundle|-bundle -bundle_loader /usr/lib/crt1.o|g\" ${worksrcpath}/admin/libtool.m4.in"
    106 #                       }
    107                 }
    108 }