[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6275f9c619b15a45790e9ed9c8cca8a9ab5171ee)

Treeve Jelbert scm at sourcemage.org
Sun Dec 16 05:29:35 EST 2007


GIT changes to master grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 ChangeLog                    |    8 ++
 FUNCTIONS                    |   37 +++++++++++
 audio-players/amarok/BUILD   |    2 
 audio-players/amarok/HISTORY |    3 
 database/knoda/DEPENDS       |    4 -
 database/knoda/DETAILS       |   34 ----------
 database/knoda/HISTORY       |  135 ------------------------------------------
 database/knorr.gpg           |    0 
 dev/null                     |binary
 disk/k3b-i18n/BUILD          |    1 
 disk/k3b-i18n/HISTORY        |    3 
 disk/k3b/BUILD               |    2 
 disk/k3b/HISTORY             |    5 +
 kde-apps/FUNCTIONS           |    8 ++
 kde-apps/KDE_BUILD           |   14 ----
 kde-apps/digikam/DEPENDS     |    1 
 kde-apps/digikam/HISTORY     |    3 
 kde-apps/knoda/DEPENDS       |    4 +
 kde-apps/knoda/DETAILS       |   34 ++++++++++
 kde-apps/knoda/HISTORY       |  138 +++++++++++++++++++++++++++++++++++++++++++
 kde-apps/kxmleditor/DEPENDS  |    2 
 kde-apps/kxmleditor/HISTORY  |    3 
 kde-core/FUNCTIONS           |    8 ++
 kde-core/KDE_BUILD           |   14 ----
 kde-core/arts/BUILD          |    1 
 kde-core/arts/DETAILS        |    1 
 kde-core/arts/HISTORY        |    5 +
 kde-core/kdeadmin/DEPENDS    |    2 
 kde-core/kdeadmin/HISTORY    |    3 
 kde-core/kdelibs/BUILD       |    7 --
 kde-core/kdelibs/DETAILS     |    1 
 kde-core/kdelibs/HISTORY     |    5 +
 kde-core/kdenetwork/DEPENDS  |    1 
 kde-core/kdenetwork/HISTORY  |    3 
 knorr.gpg                    |binary
 libs/xerces-c/DETAILS        |   10 +--
 libs/xerces-c/HISTORY        |    6 +
 libs/xerces-c/xerces.gpg     |binary
 video/kaffeine/BUILD         |    1 
 video/kmplayer/BUILD         |    2 
 video/kmplayer/HISTORY       |    3 
 41 files changed, 294 insertions(+), 220 deletions(-)

New commits:
commit 118d90334b4a13fd9e44a03fdfea2676912c20ef
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kaffeine - update kde3 build process

commit e7eddd993aa587b43b65903d25118812fd19e649
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kmplayer - update kde3 build process

commit 886eeff178f41ccd84dc42792eded7ceb0a3f9b3
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    amarok - update kde3 build process

commit dbcc60efd94f0bed2adc251292fb780381a40a1f
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    k3b-i18n - update kde3 build process

commit 337ec11460de989ca57160417dd27d8c34943907
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    k3b - update kde3 build process

commit bd999e2d0956d32a913897892a67d2a4113db973
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdelibs - update kde3 build process

commit 504b6ba579e117a3d7584472761b60785bd24dd0
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    arts - update kde3 build process

commit 04852756d5aff290de817e9a45377c320545406f
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    update kde3 build process

commit cb6a6c0d77661ae8bab646a59c7091626d27609e
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    knoda - move and also update depends

commit bf3730cbef2593e52e0e56ad51fd0ba5065e6969
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdenetwork - update depends

commit 42fda009a60221e55eac0a2b15427dc616f70722
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kxmleditor - update depends

commit 8e2cbbc8c7a7a1e26f41293866cb56acebc44f81
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    digikam - u[date depends

commit da6e501656a93a1155fe9a3e4b1404905b490adf
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdeadmin - update depends

commit efab26a17d329607dab96f1f491a41b4c7501d92
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    xerces-c-2_8_0

diff --git a/ChangeLog b/ChangeLog
index 07c70cf..507b2c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-16  Treeve Jelbert <treeve at sourcemage.org>
+	* move database/knoda to kde-apps/knoda
+	* move database/knorr.gpg to higher level
+	* FUNCTIONS: add default_kde3_build
+	* kde-{apps,core}/FUNCTIONS: added
+	* kde-{apps,core}/KDE_BUILD: use default_kde3_build
+	
+
 2007-12-15 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* php-pear/suhosin.gpg: added gpg key for suhosin
 	* libs/libmemcache: new spell, lib based on memcached
diff --git a/FUNCTIONS b/FUNCTIONS
index f9fda6a..70ea38e 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -652,3 +652,40 @@ function get_kernel_config()
   fi
 }
 
+# this is mostly copied from sorcery real_default_sorcery_build,
+# and kde-apps/KDE_BUILD
+
+# we need a different --includedir value for KDE3 spells,
+# so as to avoid conflicts with KDE4
+
+function default_kde3_build() {
+
+  if [[ -f /etc/profile.d/qt.sh ]]; then
+    . /etc/profile.d/qt.sh
+  fi                                       &&
+  OPTS="$KDE_DEBUG_OPTION                  \
+        $KDE_FINAL_OPTION                  \
+        $KDE_LDFLAGS                       \
+        --enable-dnotify                   \
+        --with-distribution                \
+        --disable-dependency-tracking      \
+        $OPTS"                             &&
+
+  OPTS="$OPTS --build=${BUILD}"
+  #If these switches are used, they _may_ stop distcc and ccache from working
+  # for some spells (bug 3798)
+  #  We could write wrappers for all of the possible binaries
+  [[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
+
+  ./configure --prefix=${INSTALL_ROOT}/usr  \
+          --sysconfdir=${INSTALL_ROOT}/etc  \
+       --localstatedir=${INSTALL_ROOT}/var  \
+              --mandir=${INSTALL_ROOT}/usr/share/man   \
+             --infodir=${INSTALL_ROOT}/usr/share/info  \
+            --includedir=${INSTALL_ROOT}/usr/include/kde3 \
+                       $OPTS                 &&
+  make
+
+}
+
+
diff --git a/audio-players/amarok/BUILD b/audio-players/amarok/BUILD
index 2372920..e93070d 100755
--- a/audio-players/amarok/BUILD
+++ b/audio-players/amarok/BUILD
@@ -1,2 +1,2 @@
 OPTS="$OPTS --without-arts" &&
-default_build
+default_kde3_build
diff --git a/audio-players/amarok/HISTORY b/audio-players/amarok/HISTORY
index 64a9b68..af451c5 100644
--- a/audio-players/amarok/HISTORY
+++ b/audio-players/amarok/HISTORY
@@ -1,3 +1,6 @@
+2007-12-16 Treeve Jelbert <treeve at sourcemage.org>
+	* BUILD: use default_kde3_build
+
 2007-08-28 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* TRIGGERS: added flac
 
diff --git a/database/knoda/DEPENDS b/database/knoda/DEPENDS
deleted file mode 100755
index 0526a9d..0000000
--- a/database/knoda/DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-depends g++             &&
-depends kdebase         &&
-depends hk_classes
-
diff --git a/database/knoda/DETAILS b/database/knoda/DETAILS
deleted file mode 100755
index 7a96206..0000000
--- a/database/knoda/DETAILS
+++ /dev/null
@@ -1,34 +0,0 @@
-           SPELL=knoda
-         VERSION=0.8.3
-          SOURCE=$SPELL-$VERSION.tar.bz2
-         SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-   SOURCE2_URL[0]=$SOURCE_URL.sig
-   SOURCE2_IGNORE=signature
- SOURCE_GPG="knorr.gpg:$SOURCE.sig:UPSTREAM_KEY"
-        WEB_SITE=http://$SPELL.SourceForge.net
-          LICENSE=LGPL
-          ENTERED=20031021
-        KEYWORDS="database kde"
-SHORT="knoda is a database frontend for KDE"
-cat << EOF
-knoda is a database frontend for KDE based on hk_classes.
-
-Knoda allows you to:
-
- 
-define and delete databases;
- 
-create, alter and delete tables and indices;
- 
-add, change and delete data in tables; 
-define, execute and store sql queries; 
-import and export CSV data; 
-define and use forms; and 
-define and print reports 
-
- 
-Its driver concept allows a uniform connection to different database 
-servers. 
-EOF
diff --git a/database/knoda/HISTORY b/database/knoda/HISTORY
deleted file mode 100755
index cd98f43..0000000
--- a/database/knoda/HISTORY
+++ /dev/null
@@ -1,135 +0,0 @@
-2006-12-17 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.8.3
-
-2006-10-27 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.8.2
-
-2006-10-13 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.8.2-test3
-
-2006-08-01 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.8.2-test2
-
-2006-04-21 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.8.1
-
-2006-03-24 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.8.1-test3
-
-2006-03-18 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.8.1-test2
-	* knoor.gpg: delete, use knorr.gpg from SECTION_DIRECTORY
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2006-01-28 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.8.1-test1
-	  use gpg checking
-	* knoor.gpg: added
-
-2005-10-26 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.8
-	* hk.diff PRE_BUILD: deleted
-
-2005-09-26 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.8-test2
-	  use SOURCE_HASH instead of MD5[0]
-	* PRE_BUILD hk.diff: fix gcc-4 compilation
-
-2005-08-18 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.8-test1
-
-2005-06-26 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.7.4
-
-2005-06-13 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.7.4-test3
-
-2005-05-29 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.7.4-test2
-	* BUILD hk.diff:: delete 
-
-2005-05-16 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.7.4-test1
-	* BUILD: add patch
-	  disable redundant 'sed' commands
-	* hk.diff: add, fix compilation errors
-
-2005-03-25 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.7.3
-
-2005-02-27 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.7.3-test2
-
-2004-11-29 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.7.2
-
-2004-11-07 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.7.2-test3
-
-2004-11-01 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.7.2-test2
-
-2004-09-19 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.7.1
-
-2004-09-10 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.7.1-test2
-
-2004-08-24 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.7.1-test1
-
-2004-07-12 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.7
-	* BUILD: clean
-
-2004-07-09 Treeve Jelbert <treeve at sourcemage.org>
-	* DEPENDS: add g++
-	  remove python
-
-2004-06-16 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.7-test3a
-	* gcc.diff: really delete it
-
-2004-06-05 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.7-test2
-	  BUILD_API=2
-	* gcc.diff: delete
-	* BUILD: gcc fixes
-
-2004-05-06 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.7-test1
-	* BUILD gcc.diff: update patch
-
-2004-05-06 Treeve Jelbert <treeve at sourcemage.org>
-	* BUILD gcc.diff: added
-	  fix compilation problems with gcc-3.4.0
-
-2004-04-06 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.6.3
-
-2004-03-15 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.6.3-test3
-
-2004-03-02 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.6.3-test2
-	* BUILD: deleted, as no longer needed
-
-2004-01-04 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.6.3-test1
-	* BUILD: remove patch, edit python/Makefile
-
-2003-12-03 Treeve Jelbert <treeve at sourcemage.org>
-	* BUILD: patch python/Makefile
-
-2003-11-19 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.6.2a
-	* BUILD: remove, use default
-	* DEPENDS: depends SQL, not postgresql, mysql or ...
-
-2003-10-21 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.6.1
-	* BUILD, DEPENDS: added
-	  spell created
-
diff --git a/database/knorr.gpg b/database/knorr.gpg
deleted file mode 100644
index 0eb99db..0000000
Binary files a/database/knorr.gpg and /dev/null differ
diff --git a/disk/k3b-i18n/BUILD b/disk/k3b-i18n/BUILD
new file mode 100755
index 0000000..39ad889
--- /dev/null
+++ b/disk/k3b-i18n/BUILD
@@ -0,0 +1 @@
+default_kde3_build
diff --git a/disk/k3b-i18n/HISTORY b/disk/k3b-i18n/HISTORY
index d28420f..a43f415 100644
--- a/disk/k3b-i18n/HISTORY
+++ b/disk/k3b-i18n/HISTORY
@@ -1,3 +1,6 @@
+2007-12-16 Treeve Jelbert <treeve at sourcemage.org>
+	* BUILD: added, use default_kde3_build
+
 2007-22-03 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.0.4
 
diff --git a/disk/k3b/BUILD b/disk/k3b/BUILD
index 8517cba..94f52ec 100755
--- a/disk/k3b/BUILD
+++ b/disk/k3b/BUILD
@@ -1,3 +1,3 @@
 OPTS="--disable-debug --disable-warnings ${OPTS}"   &&
-default_build
+default_kde3_build
 
diff --git a/disk/k3b/HISTORY b/disk/k3b/HISTORY
index 2555a6a..eaf3184 100644
--- a/disk/k3b/HISTORY
+++ b/disk/k3b/HISTORY
@@ -1,4 +1,7 @@
-2007-11-03Treeve Jelbert <treeve at sourcemage.org>
+2007-12-16 Treeve Jelbert <treeve at sourcemage.org>
+	* BUILD: use default_kde3_build
+
+2007-11-03 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: Updated to 1.0.4
 
 2007-07-23 Treeve Jelbert <treeve at sourcemage.org>
diff --git a/kde-apps/FUNCTIONS b/kde-apps/FUNCTIONS
new file mode 100755
index 0000000..2a2dd1f
--- /dev/null
+++ b/kde-apps/FUNCTIONS
@@ -0,0 +1,8 @@
+# we need a different --includedir value for KDE3 spells,
+# so as to avoid conflicts with KDE4
+
+function default_build() {
+  default_kde3_build
+}
+
+
diff --git a/kde-apps/KDE_BUILD b/kde-apps/KDE_BUILD
index f851eaf..39ad889 100755
--- a/kde-apps/KDE_BUILD
+++ b/kde-apps/KDE_BUILD
@@ -1,13 +1 @@
-OPTS="$KDE_DEBUG_OPTION                  \
-      $KDE_FINAL_OPTION                  \
-      $KDE_LDFLAGS                       \
-      --enable-dnotify                   \
-      --with-distribution                \
-      --disable-dependency-tracking      \
-      $OPTS"                             &&
-
-if [[ -f /etc/profile.d/qt.sh ]]; then
-  . /etc/profile.d/qt.sh
-fi                                       &&
-
-default_build
+default_kde3_build
diff --git a/kde-apps/digikam/DEPENDS b/kde-apps/digikam/DEPENDS
index cbb773c..911645f 100755
--- a/kde-apps/digikam/DEPENDS
+++ b/kde-apps/digikam/DEPENDS
@@ -1,6 +1,5 @@
 source  "$SECTION_DIRECTORY/KDE_DEPENDS"  &&
 
-depends  kdebase     &&
 depends  lcms        &&
 depends  libgphoto2  &&
 depends  libkipi     &&
diff --git a/kde-apps/digikam/HISTORY b/kde-apps/digikam/HISTORY
index 4c4a285..8a7f259 100644
--- a/kde-apps/digikam/HISTORY
+++ b/kde-apps/digikam/HISTORY
@@ -1,3 +1,6 @@
+2007-12-15 Treeve Jelbert <treevesourcemage.org>
+	* DEPENDS: remove kdebase; kdelibs is enough
+
 2007-12-08 Treeve Jelbert <treevesourcemage.org>
 	* DETAILS: version 0.9.3-rc1 (devel)
 
diff --git a/kde-apps/knoda/DEPENDS b/kde-apps/knoda/DEPENDS
new file mode 100755
index 0000000..ec7c2ba
--- /dev/null
+++ b/kde-apps/knoda/DEPENDS
@@ -0,0 +1,4 @@
+depends g++             &&
+depends kdelibs         &&
+depends hk_classes
+
diff --git a/kde-apps/knoda/DETAILS b/kde-apps/knoda/DETAILS
new file mode 100755
index 0000000..7a96206
--- /dev/null
+++ b/kde-apps/knoda/DETAILS
@@ -0,0 +1,34 @@
+           SPELL=knoda
+         VERSION=0.8.3
+          SOURCE=$SPELL-$VERSION.tar.bz2
+         SOURCE2=$SOURCE.sig
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+   SOURCE2_URL[0]=$SOURCE_URL.sig
+   SOURCE2_IGNORE=signature
+ SOURCE_GPG="knorr.gpg:$SOURCE.sig:UPSTREAM_KEY"
+        WEB_SITE=http://$SPELL.SourceForge.net
+          LICENSE=LGPL
+          ENTERED=20031021
+        KEYWORDS="database kde"
+SHORT="knoda is a database frontend for KDE"
+cat << EOF
+knoda is a database frontend for KDE based on hk_classes.
+
+Knoda allows you to:
+
+ 
+define and delete databases;
+ 
+create, alter and delete tables and indices;
+ 
+add, change and delete data in tables; 
+define, execute and store sql queries; 
+import and export CSV data; 
+define and use forms; and 
+define and print reports 
+
+ 
+Its driver concept allows a uniform connection to different database 
+servers. 
+EOF
diff --git a/kde-apps/knoda/HISTORY b/kde-apps/knoda/HISTORY
new file mode 100755
index 0000000..8c5fd43
--- /dev/null
+++ b/kde-apps/knoda/HISTORY
@@ -0,0 +1,138 @@
+2007-12-16 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: kdebase -> kdelibs
+
+2006-12-17 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.8.3
+
+2006-10-27 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.8.2
+
+2006-10-13 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.8.2-test3
+
+2006-08-01 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.8.2-test2
+
+2006-04-21 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.8.1
+
+2006-03-24 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.8.1-test3
+
+2006-03-18 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.8.1-test2
+	* knoor.gpg: delete, use knorr.gpg from SECTION_DIRECTORY
+
+2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
+	* DETAILS: (automated) Add KEYWORDS
+
+2006-01-28 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.8.1-test1
+	  use gpg checking
+	* knoor.gpg: added
+
+2005-10-26 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.8
+	* hk.diff PRE_BUILD: deleted
+
+2005-09-26 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.8-test2
+	  use SOURCE_HASH instead of MD5[0]
+	* PRE_BUILD hk.diff: fix gcc-4 compilation
+
+2005-08-18 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.8-test1
+
+2005-06-26 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7.4
+
+2005-06-13 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7.4-test3
+
+2005-05-29 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7.4-test2
+	* BUILD hk.diff:: delete 
+
+2005-05-16 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7.4-test1
+	* BUILD: add patch
+	  disable redundant 'sed' commands
+	* hk.diff: add, fix compilation errors
+
+2005-03-25 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7.3
+
+2005-02-27 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7.3-test2
+
+2004-11-29 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7.2
+
+2004-11-07 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7.2-test3
+
+2004-11-01 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7.2-test2
+
+2004-09-19 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7.1
+
+2004-09-10 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7.1-test2
+
+2004-08-24 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7.1-test1
+
+2004-07-12 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7
+	* BUILD: clean
+
+2004-07-09 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add g++
+	  remove python
+
+2004-06-16 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7-test3a
+	* gcc.diff: really delete it
+
+2004-06-05 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7-test2
+	  BUILD_API=2
+	* gcc.diff: delete
+	* BUILD: gcc fixes
+
+2004-05-06 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7-test1
+	* BUILD gcc.diff: update patch
+
+2004-05-06 Treeve Jelbert <treeve at sourcemage.org>
+	* BUILD gcc.diff: added
+	  fix compilation problems with gcc-3.4.0
+
+2004-04-06 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.6.3
+
+2004-03-15 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.6.3-test3
+
+2004-03-02 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.6.3-test2
+	* BUILD: deleted, as no longer needed
+
+2004-01-04 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.6.3-test1
+	* BUILD: remove patch, edit python/Makefile
+
+2003-12-03 Treeve Jelbert <treeve at sourcemage.org>
+	* BUILD: patch python/Makefile
+
+2003-11-19 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.6.2a
+	* BUILD: remove, use default
+	* DEPENDS: depends SQL, not postgresql, mysql or ...
+
+2003-10-21 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.6.1
+	* BUILD, DEPENDS: added
+	  spell created
+
diff --git a/kde-apps/kxmleditor/DEPENDS b/kde-apps/kxmleditor/DEPENDS
index 064b7b5..1c3e041 100755
--- a/kde-apps/kxmleditor/DEPENDS
+++ b/kde-apps/kxmleditor/DEPENDS
@@ -1,2 +1,2 @@
-depends kdebase
+depends kdelibs
 
diff --git a/kde-apps/kxmleditor/HISTORY b/kde-apps/kxmleditor/HISTORY
index 2ae9c5a..b912608 100755
--- a/kde-apps/kxmleditor/HISTORY
+++ b/kde-apps/kxmleditor/HISTORY
@@ -1,3 +1,6 @@
+2007-12-15 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: remove kdebase; kdelibs is enough
+
 2006-06-29 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Removed BUILD_API=2, set grimoire-wide
 
diff --git a/kde-core/FUNCTIONS b/kde-core/FUNCTIONS
new file mode 100755
index 0000000..2428046
--- /dev/null
+++ b/kde-core/FUNCTIONS
@@ -0,0 +1,8 @@
+# this is mostly copied from sorcery real_default_sorcery_build,
+# so as to avoid conflicts with KDE4
+
+function default_build() {
+  default_kde3_build
+}
+
+
diff --git a/kde-core/KDE_BUILD b/kde-core/KDE_BUILD
index f851eaf..39ad889 100755
--- a/kde-core/KDE_BUILD
+++ b/kde-core/KDE_BUILD
@@ -1,13 +1 @@
-OPTS="$KDE_DEBUG_OPTION                  \
-      $KDE_FINAL_OPTION                  \
-      $KDE_LDFLAGS                       \
-      --enable-dnotify                   \
-      --with-distribution                \
-      --disable-dependency-tracking      \
-      $OPTS"                             &&
-
-if [[ -f /etc/profile.d/qt.sh ]]; then
-  . /etc/profile.d/qt.sh
-fi                                       &&
-
-default_build
+default_kde3_build
diff --git a/kde-core/arts/BUILD b/kde-core/arts/BUILD
deleted file mode 100755
index d4b482b..0000000
--- a/kde-core/arts/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-source  $SECTION_DIRECTORY/KDE_BUILD
diff --git a/kde-core/arts/DETAILS b/kde-core/arts/DETAILS
index 8aa9c55..eef41f0 100755
--- a/kde-core/arts/DETAILS
+++ b/kde-core/arts/DETAILS
@@ -8,6 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$KDE_URL/stable/3.5.8/src/$SOURCE
         WEB_SITE=http://www.kde.org/
          ENTERED=20020322
+      PATCHLEVEL=1
   SECURITY_PATCH=1
       LICENSE[0]=GPL
         KEYWORDS="kde audio"
diff --git a/kde-core/arts/HISTORY b/kde-core/arts/HISTORY
index 6ac7c33..f2f259a 100644
--- a/kde-core/arts/HISTORY
+++ b/kde-core/arts/HISTORY
@@ -1,3 +1,8 @@
+2007-12-16 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: PATCHLEVEL++
+	* BUILD: deleted
+	  now use default_kde3_build
+
 2007-10-16 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.5.8
 
diff --git a/kde-core/kdeadmin/DEPENDS b/kde-core/kdeadmin/DEPENDS
index 4a01186..b098aa0 100755
--- a/kde-core/kdeadmin/DEPENDS
+++ b/kde-core/kdeadmin/DEPENDS
@@ -1,5 +1,3 @@
-depends  kdebase  &&
-
 source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
 
 optional_depends  shadow                         \
diff --git a/kde-core/kdeadmin/HISTORY b/kde-core/kdeadmin/HISTORY
index b5f099e..8c4cf0e 100644
--- a/kde-core/kdeadmin/HISTORY
+++ b/kde-core/kdeadmin/HISTORY
@@ -1,3 +1,6 @@
+2007-12-15  Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: remove kdebase, kdelibs is enough
+
 2007-10-16  Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.5.8
 
diff --git a/kde-core/kdelibs/BUILD b/kde-core/kdelibs/BUILD
deleted file mode 100755
index 255ec26..0000000
--- a/kde-core/kdelibs/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-sedit "s/hicolor //" pics/Makefile.in   &&
-
-source  $SECTION_DIRECTORY/KDE_BUILD  &&
-
-if  spell_ok  doxygen;  then
-  make  apidox
-fi
diff --git a/kde-core/kdelibs/DETAILS b/kde-core/kdelibs/DETAILS
index 48db127..fe47a41 100755
--- a/kde-core/kdelibs/DETAILS
+++ b/kde-core/kdelibs/DETAILS
@@ -8,6 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
         WEB_SITE=http://www.kde.org
          ENTERED=20020912
+      PATCHLEVEL=1
   SECURITY_PATCH=5
       LICENSE[0]=GPL
         KEYWORDS="kde"
diff --git a/kde-core/kdelibs/HISTORY b/kde-core/kdelibs/HISTORY
index dee9263..f67c017 100644
--- a/kde-core/kdelibs/HISTORY
+++ b/kde-core/kdelibs/HISTORY
@@ -1,3 +1,8 @@
+2007-12-16  Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: PATCHLEVEL++
+	* BUILD: deleted
+	  use default_kde3_build
+
 2007-10-16  Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.5.8
 	* PRE_BUILD, *.diff: deleted, already applied
diff --git a/kde-core/kdenetwork/DEPENDS b/kde-core/kdenetwork/DEPENDS
index 5e1e16a..45c814b 100755
--- a/kde-core/kdenetwork/DEPENDS
+++ b/kde-core/kdenetwork/DEPENDS
@@ -1,4 +1,3 @@
-depends  kdebase  &&
 depends  perl     &&
 
 source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
diff --git a/kde-core/kdenetwork/HISTORY b/kde-core/kdenetwork/HISTORY
index 43e1897..cadb2a7 100644
--- a/kde-core/kdenetwork/HISTORY
+++ b/kde-core/kdenetwork/HISTORY
@@ -1,3 +1,6 @@
+2007-12-15  Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: remove kdebase; kdelibs is enough
+
 2007-10-16  Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.5.8
 
diff --git a/knorr.gpg b/knorr.gpg
new file mode 100644
index 0000000..0eb99db
Binary files /dev/null and b/knorr.gpg differ
diff --git a/libs/xerces-c/DETAILS b/libs/xerces-c/DETAILS
index bdd5fd0..230b57e 100755
--- a/libs/xerces-c/DETAILS
+++ b/libs/xerces-c/DETAILS
@@ -1,12 +1,14 @@
            SPELL=xerces-c
-         VERSION=2_7_0
+         VERSION=2_8_0
           SOURCE=$SPELL-src_$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-src_$VERSION
-   SOURCE_URL[0]=http://www.apache.org/dist/xml/$SPELL/source/$SOURCE
-     SOURCE_HASH=sha512:9887acf3930379da9cb7ab67847ddb381615b5d1b8240cf8915bb7e084c66bdfc139f98a118f86852b53d44159f2fa3fe3ac0b634f5055105b8349df65e6e642:UPSTREAM_HASH
+   SOURCE_URL[0]=$APACHE_URL/${SPELL//-c}/c/sources/$SOURCE
+         SOURCE2=$SOURCE.asc
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+      SOURCE_GPG=xerces.gpg:$SOURCE.asc:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
         WEB_SITE=http://xml.apache.org/xerces-c/index.html
          ENTERED=20030320
-         UPDATED=20030718
       LICENSE[0]=APACHE
         KEYWORDS="parser xml libs"
            SHORT="Xerces-C++ is a validating XML parser"
diff --git a/libs/xerces-c/HISTORY b/libs/xerces-c/HISTORY
index 0bc19a7..87d91f3 100644
--- a/libs/xerces-c/HISTORY
+++ b/libs/xerces-c/HISTORY
@@ -1,3 +1,9 @@
+2007-12-15 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2_8_0
+	  new url
+	  convert to gpg check
+	* xerces.gpg: added
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/libs/xerces-c/xerces.gpg b/libs/xerces-c/xerces.gpg
new file mode 100644
index 0000000..4d05f36
Binary files /dev/null and b/libs/xerces-c/xerces.gpg differ
diff --git a/video/kaffeine/BUILD b/video/kaffeine/BUILD
new file mode 100755
index 0000000..39ad889
--- /dev/null
+++ b/video/kaffeine/BUILD
@@ -0,0 +1 @@
+default_kde3_build
diff --git a/video/kmplayer/BUILD b/video/kmplayer/BUILD
index 24b3465..87311ce 100755
--- a/video/kmplayer/BUILD
+++ b/video/kmplayer/BUILD
@@ -5,4 +5,4 @@ if ! list_find "$BACKENDS" "gstreamer"; then
   OPTS="$OPTS --without-gstreamer"
 fi  &&
 
-default_build
+default_kde3_build
diff --git a/video/kmplayer/HISTORY b/video/kmplayer/HISTORY
index a6d5e0b..2b94c09 100644
--- a/video/kmplayer/HISTORY
+++ b/video/kmplayer/HISTORY
@@ -1,3 +1,6 @@
+2007-12-16 Treeve Jelbert <treeve at sourcemage.org>
+	* BUILD: use default_kde3_build
+
 2007-10-27 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.10.0a
 



More information about the SM-Commit mailing list