[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6e7a1f3843d65da77c7538b565e59e4cafc4b1ea)

Treeve Jelbert scm at sourcemage.org
Tue Jun 16 08:42:47 EDT 2009


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

 database/tokyocabinet/DETAILS        |    4 ++--
 database/tokyocabinet/HISTORY        |    3 +++
 kde4/kdelibs4-experimental/CONFLICTS |    1 -
 kde4/kdelibs4-experimental/HISTORY   |    5 +++++
 kde4/kdelibs4-experimental/TRIGGERS  |    2 ++
 mobile/gpsd/BUILD                    |    4 ----
 mobile/gpsd/DETAILS                  |    5 +++--
 mobile/gpsd/HISTORY                  |    4 ++++
 mobile/gpsd/xorg.patch               |   10 ----------
 science/viking/BUILD                 |    2 --
 science/viking/DEPENDS               |    4 +++-
 science/viking/DETAILS               |    4 ++--
 science/viking/HISTORY               |    6 ++++++
 13 files changed, 30 insertions(+), 24 deletions(-)

New commits:
commit 2e4c1a4271e69d5a65e9c40adcb8b0d38ae62fa6
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    viking: => 0.9.8

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

    gpsd: => 2.39

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

    tokyocabinet: => 1.4.26

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

    kdelibs4-experimental - remove obsolete CONFLICTS, add new TRIGGERS

diff --git a/database/tokyocabinet/DETAILS b/database/tokyocabinet/DETAILS
index d581d9c..ae41129 100755
--- a/database/tokyocabinet/DETAILS
+++ b/database/tokyocabinet/DETAILS
@@ -1,6 +1,6 @@
            SPELL=tokyocabinet
-         VERSION=1.4.25
-     SOURCE_HASH=sha512:be8f8e01f4d8c557a8be19212f61774a8fa0f20224b7b5b7a30a027dac971954146f3226e2d92dd9755ce50fa070c576bcc30ca52611dcf807dd077302e3b6a3
+         VERSION=1.4.26
+     SOURCE_HASH=sha512:a2fb14add2d43778223d48eaa252c4f07f36a0d3a1c291127f5154f2ebbfc15b5ba1a1e26bc9a08afad918c6b5ea27c1101649857d61e873efd7acc4670b1699
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://$SPELL.sf.net/$SOURCE
diff --git a/database/tokyocabinet/HISTORY b/database/tokyocabinet/HISTORY
index 5dd8d2b..105eb75 100644
--- a/database/tokyocabinet/HISTORY
+++ b/database/tokyocabinet/HISTORY
@@ -1,3 +1,6 @@
+2009-06-16 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.4.26
+
 2009-05-12 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.4.25
 
diff --git a/kde4/kdelibs4-experimental/CONFLICTS b/kde4/kdelibs4-experimental/CONFLICTS
deleted file mode 100755
index 268aa6b..0000000
--- a/kde4/kdelibs4-experimental/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts kdebase-workspace4
diff --git a/kde4/kdelibs4-experimental/HISTORY b/kde4/kdelibs4-experimental/HISTORY
index bbb9c64..a2f89b3 100644
--- a/kde4/kdelibs4-experimental/HISTORY
+++ b/kde4/kdelibs4-experimental/HISTORY
@@ -1,3 +1,8 @@
+2009-06-15 Treeve Jelbert <treeve at sourcemage.org>
+	* CONFLICTS: deleted, obsolete
+	* TRIGGERS: add, 
+	  to allow migration of stuff from kdelibs4-experimental -> kdelibs4
+
 2009-06-10 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.2.90 (unstable)
 
diff --git a/kde4/kdelibs4-experimental/TRIGGERS b/kde4/kdelibs4-experimental/TRIGGERS
new file mode 100755
index 0000000..fe934a2
--- /dev/null
+++ b/kde4/kdelibs4-experimental/TRIGGERS
@@ -0,0 +1,2 @@
+on_pre_cast kdelibs4 dispel_self
+on_cast kdelibs4 cast_self
diff --git a/mobile/gpsd/BUILD b/mobile/gpsd/BUILD
deleted file mode 100644
index 234ce6e..0000000
--- a/mobile/gpsd/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-./autogen.sh					&&
-patch -p0 < $SCRIPT_DIRECTORY/xorg.patch	&&
-default_build
-
diff --git a/mobile/gpsd/DETAILS b/mobile/gpsd/DETAILS
index a78098a..54a6454 100755
--- a/mobile/gpsd/DETAILS
+++ b/mobile/gpsd/DETAILS
@@ -1,9 +1,10 @@
            SPELL=gpsd
-         VERSION=2.37
+         VERSION=2.39
+     SOURCE_HASH=sha512:81f95e7da09ca7dd1a077331807a961dcb2900f53273586c6a098fe9f65b741ce00a533b714c7d57bb25e911decbe6d9763c5bb8c85b630a5e5d6cc107f5a2a4
           SOURCE=$SPELL-${VERSION}.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://download.berlios.de/gpsd/$SOURCE
-     SOURCE_HASH=sha512:cd2efd62320a81e076994dc9de8631362b38e5bd1d431dc61240b1296feaafc46724a58845f7ac89e5331721f2dc4b535a2f0694673e3513efcf3ca63a9cb471
+
         WEB_SITE=http://gpsd.berlios.de/
          ENTERED=20040217
          LICENSE=GPL
diff --git a/mobile/gpsd/HISTORY b/mobile/gpsd/HISTORY
index 790cac8..a5373a9 100644
--- a/mobile/gpsd/HISTORY
+++ b/mobile/gpsd/HISTORY
@@ -1,3 +1,7 @@
+2009-06-16 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.39
+	* BUILD, xorg.patch: deleted
+
 2008-03-18 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Switch X11-SERVER to the one and only xorg-server
 
diff --git a/mobile/gpsd/xorg.patch b/mobile/gpsd/xorg.patch
deleted file mode 100644
index a02673c..0000000
--- a/mobile/gpsd/xorg.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xgpsspeed.c.orig	2005-03-23 20:45:25.000000000 +0000
-+++ xgpsspeed.c	2005-03-23 20:45:45.000000000 +0000
-@@ -9,6 +9,7 @@
- #include <X11/Shell.h>
- #include <X11/Xaw/Label.h>
- #include <X11/Xaw/Paned.h>
-+#include <Xm/Xm.h>
- #include <Xm/XmStrDefs.h>
- #include <Tachometer.h>
- 
diff --git a/science/viking/BUILD b/science/viking/BUILD
deleted file mode 100755
index 589720d..0000000
--- a/science/viking/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-make_single &&
-default_build
diff --git a/science/viking/DEPENDS b/science/viking/DEPENDS
index d753201..935212f 100755
--- a/science/viking/DEPENDS
+++ b/science/viking/DEPENDS
@@ -1,4 +1,6 @@
+depends pkgconfig  &&
 depends xorg-libs  &&
 depends gtk+2     &&
 depends expat     &&
-depends curl
+depends curl      &&
+optional_depends gpsd '' '--disable-realtime-gps-tracking' 'Realtime GPS Tracking'
diff --git a/science/viking/DETAILS b/science/viking/DETAILS
index 1b1350b..4c85a62 100755
--- a/science/viking/DETAILS
+++ b/science/viking/DETAILS
@@ -1,8 +1,8 @@
            SPELL=viking
-         VERSION=0.9.2
+         VERSION=0.9.8
+     SOURCE_HASH=sha512:f0141211c25aaf148c59e7923c494e3dcbe2a95212e64de2868e56517f4fda794f2ef52a5b059487c80ca7755a529e791fdac5c109c9303242a626f34e2155d3
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:2c41eb08234861dfc59fecebfbcbdcb03028b28c04800f7a2baa1018367c375a370d302f01105fc948cd257747b3b750e396f2cb08d4accb4dae1fa448a38df2
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://viking.sf.net/ "
       LICENSE[0]=GPL
diff --git a/science/viking/HISTORY b/science/viking/HISTORY
index f61815b..9cccc39 100644
--- a/science/viking/HISTORY
+++ b/science/viking/HISTORY
@@ -1,3 +1,9 @@
+2009-06-16 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.9.8
+	  fixes bug #15268
+	* BUILD: deleted
+	* DEPENDS: add pkgconfig, optional gpsd
+
 2008-03-18 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 



More information about the SM-Commit mailing list