OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Torsten Homeyer
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   06-Aug-2004 11:34:44
  Branch: HEAD                             Handle: 2004080610344300

  Modified files:
    openpkg-src/kde-base    kde-base.patch kde-base.spec

  Log:
    at least it builds now

  Summary:
    Revision    Changes     Path
    1.3         +34 -22     openpkg-src/kde-base/kde-base.patch
    1.10        +44 -3      openpkg-src/kde-base/kde-base.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/kde-base/kde-base.patch
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 kde-base.patch
  --- openpkg-src/kde-base/kde-base.patch       19 Sep 2003 11:25:25 -0000      1.2
  +++ openpkg-src/kde-base/kde-base.patch       6 Aug 2004 09:34:43 -0000       1.3
  @@ -1,25 +1,25 @@
  ---- kdesktop/init.cc.orig    Fri Oct 12 15:11:13 2001
  -+++ kdesktop/init.cc Thu Jul 18 06:48:59 2002
  -@@ -80,6 +80,9 @@
  -      QFile::encodeName(locate("data", QString("kdesktop/") + fileName)).data(),
  -      QFile::encodeName(dir).data() );
  -     system( cmd );
  -+    cmd.sprintf( "chmod 644 %s/.directory", 
  -+             QFile::encodeName(dir).data() );
  -+    system( cmd );
  -   }
  - }
  - 
  -@@ -106,6 +109,9 @@
  -     cmd += "' '";
  -     cmd += QFile::encodeName(desktopPath + desk.readName());
  -     cmd += "'";
  -+    system( cmd );
  -+    cmd.sprintf("chmod 644 '%s'",
  -+                QFile::encodeName(desktopPath + desk.readName()).data());
  -     system( cmd );
  -     }
  - }
  +#--- kdesktop/init.cc.orig   Fri Oct 12 15:11:13 2001
  +#+++ kdesktop/init.cc        Thu Jul 18 06:48:59 2002
  +#@@ -80,6 +80,9 @@
  +#      QFile::encodeName(locate("data", QString("kdesktop/") + fileName)).data(),
  +#      QFile::encodeName(dir).data() );
  +#     system( cmd );
  +#+    cmd.sprintf( "chmod 644 %s/.directory", 
  +#+            QFile::encodeName(dir).data() );
  +#+    system( cmd );
  +#   }
  +# }
  +# 
  +#@@ -106,6 +109,9 @@
  +#    cmd += "' '";
  +#    cmd += QFile::encodeName(desktopPath + desk.readName());
  +#    cmd += "'";
  +#+   system( cmd );
  +#+   cmd.sprintf("chmod 644 '%s'",
  +#+               QFile::encodeName(desktopPath + desk.readName()).data());
  +#    system( cmd );
  +#     }
  +# }
   --- kdm/backend/xdmcp.c.orig Wed May  8 14:21:31 2002
   +++ kdm/backend/xdmcp.c      Wed Jun 26 20:14:02 2002
   @@ -1012,7 +1012,7 @@
  @@ -31,3 +31,15 @@
        status.length = strlen (buf);
        status.data = (CARD8Ptr) buf;
        header.version = XDM_PROTOCOL_VERSION;
  +Index: kioslave/fish/Makefile.in
  +--- kioslave/fish/Makefile.in.orig   2004-06-02 09:42:15 +0200
  ++++ kioslave/fish/Makefile.in        2004-08-06 10:08:17 +0200
  +@@ -851,7 +851,7 @@
  + fishcode.h: fish.pl
  +     if echo | md5sum > /dev/null 2>&1 ; then \
  +     SUM=`md5sum $(srcdir)/fish.pl | cut -d ' ' -f 1`; else \
  +-    SUM=`md5 $(srcdir)/fish.pl | cut -d ' ' -f 4`; fi; \
  ++    SUM=`md5 $(srcdir)/fish.pl | sed -n -e 's;^.*\([a-fA-F0-9]\{32\}\).*$$;\1;p'`; 
fi; \
  +     echo '#define CHECKSUM "'$$SUM'"' > $@; \
  +     echo 'static const char *fishCode(' >> $@; \
  +     sed -e 's/\\/\\\\/g;s/"/\\"/g;s/^[      ]*/"/;/^"# /d;s/[       
]*$$/\\n"/;/^"\\n"$$/d;s/{CHECKSUM}/'$$SUM'/;' $(srcdir)/fish.pl >> $@; \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/kde-base/kde-base.spec
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 kde-base.spec
  --- openpkg-src/kde-base/kde-base.spec        7 Feb 2004 17:55:54 -0000       1.9
  +++ openpkg-src/kde-base/kde-base.spec        6 Aug 2004 09:34:43 -0000       1.10
  @@ -24,8 +24,8 @@
   ##
   
   #   package version
  -%define       V_kde      3.1.4
  -%define       V_base     3.1.4
  +%define       V_kde      3.2.3
  +%define       V_base     3.2.3
   
   #   package information
   Name:         kde-base
  @@ -38,7 +38,7 @@
   Group:        KDE
   License:      GPL
   Version:      %{V_base}
  -Release:      20040207
  +Release:      20040806
   
   #   list of sources
   Source0:      
ftp://ftp.kde.org/pub/kde/stable/%{V_kde}/src/kdebase-%{V_base}.tar.bz2
  @@ -119,6 +119,7 @@
       export MOC="%{l_prefix}/libexec/kde/moc"
       export UIC_PATH="%{l_prefix}/libexec/kde/uic"
       export HOME="`pwd`"
  +    export KDECONFIG="%{l_prefix}/libexec/kde/kde-config"
   
       #   set KDE/Qt installation paths
       export KDEDIR="%{l_prefix}"
  @@ -166,6 +167,46 @@
           --disable-static \
           --enable-shared
   
  +    #   prevent linking of static libraries to early in the build process
  +    %{l_shtool} subst \
  +        -e 's;\-lXrender;;g' \
  +        -e 's;\-lexpat;;g' \
  +        -e 's;\-lfreetype;;g' \
  +        -e 's;\-lfontconfig;;g' \
  +        kate/interfaces/Makefile \
  +        kcontrol/background/Makefile \
  +        kcontrol/filetypes/Makefile \
  +        kcontrol/input/Makefile \
  +        kcontrol/style/Makefile \
  +        kcontrol/kcontrol/Makefile \
  +        kcontrol/colors/Makefile \
  +        kcontrol/fonts/Makefile \
  +        kcontrol/kfontinst/lib/Makefile \
  +        kfind/Makefile \
  +        khotkeys/kcontrol/ui/Makefile \
  +        khotkeys/shared/Makefile \
  +        kicker/share/Makefile \
  +        kicker/core/Makefile \
  +        kicker/buttons/Makefile \
  +        kicker/ui/Makefile \
  +        klipper/Makefile \
  +        ksplashml/themeengine/default/Makefile \
  +        ksplashml/themeengine/redmond/Makefile \
  +        ksplashml/themeengine/standard/Makefile \
  +        ksysguard/gui/SensorDisplayLib/Makefile \
  +        libkonq/Makefile
  +
  +    #   if linked with static libraries, order is important
  +    %{l_shtool} subst \
  +        -e '/^kfontinst_LDADD = /s;\(\$(LIBFONTCONFIG_LIBS) \$(LIBFREETYPE_LIBS)\) 
\(\$(LIB_KDECORE) \.\./lib/libkfontinst.la\);\2 \1;' \
  +        kcontrol/kfontinst/kfontinst/Makefile
  +
  +    #   add directives for pcre where needed
  +    %{l_shtool} subst \
  +        -e '/LIBS = /s;\(\-lqt-mt\);\-lpcreposix \-lpcre \1;g' \
  +        khelpcenter/Makefile \
  +        kdesktop/kwebdesktop/Makefile
  +
       #   build package
       %{l_make} %{l_mflags -O}
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to