[SM-Commit] GIT changes to master grimoire by Robin Cook (9a19fa00cad75076c6b53eb925a54ffec7d0d638)

Robin Cook scm at mail.sourcemage.org
Sat Sep 30 14:46:08 EDT 2006


GIT changes to master grimoire by Robin Cook <rcook at wyrms.net>:

 dev/null                                                       |binary
 gnome2-libs/evolution-sharp/HISTORY                            |    4 
 gnome2-libs/evolution-sharp/PRE_BUILD                          |    6 +
 gnome2-libs/evolution-sharp/evolution-sharp-0.11.1-evo28.patch |   53 ++++++++++
 libs/libgalago/DEPENDS                                         |    4 
 libs/libgalago/DETAILS                                         |    5 
 libs/libgalago/HISTORY                                         |    9 +
 libs/libgalago/PRE_BUILD                                       |    5 
 libs/libgalago/libgalago-0.3.3.tar.gz.sig                      |    0 
 libs/libgalago/libgalago-0.5.1-mkinstalldirs.patch             |   24 ++++
 libs/libgalago/libgalago-0.5.1.tar.bz2.sig                     |binary
 utils/galago-daemon/DEPENDS                                    |    3 
 utils/galago-daemon/DETAILS                                    |   14 ++
 utils/galago-daemon/HISTORY                                    |    3 
 utils/galago-daemon/galago-daemon-0.5.0.tar.bz2.sig            |binary
 15 files changed, 123 insertions(+), 7 deletions(-)

New commits:
commit 9a19fa00cad75076c6b53eb925a54ffec7d0d638
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    galago-daemon: new spell

commit e712360c90b4d5e869bf0509cc64a7f94b89b2be
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    libgalago: changed SOURCE to bz2

commit 7d75faadb576abbfa1e8cab21dca95bc9ea516d8
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    evolution-sharp: added patch to build with evolution 2.8 (bug #13141)

commit 0fe950c6b4bbae9f6e5c4f62e69cc8c4ea58e153
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    libgalago: added dbus to depends

commit 1e6ef48fbe51c536341766f8dfd23d2c051ecfda
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    libgalago: updated to 0.5.1

diff --git a/gnome2-libs/evolution-sharp/HISTORY b/gnome2-libs/evolution-sharp/HISTORY
index bda1a4c..c41b8ed 100644
--- a/gnome2-libs/evolution-sharp/HISTORY
+++ b/gnome2-libs/evolution-sharp/HISTORY
@@ -1,3 +1,7 @@
+2006-09-26 Harry Broeken <harry.broeken at home.nl>
+	* PREBUILD: added to apply patch to build against evolution-2.8
+	* evolution-sharp-0.11.1-evo28.patch: copied from fedora's SRPM (bug #13141)
+
 2006-07-23 Robin Cook <rcook at wyrms.net>
 	* DEPENDS: added evolution2
 
diff --git a/gnome2-libs/evolution-sharp/PRE_BUILD b/gnome2-libs/evolution-sharp/PRE_BUILD
new file mode 100755
index 0000000..aa338a4
--- /dev/null
+++ b/gnome2-libs/evolution-sharp/PRE_BUILD
@@ -0,0 +1,6 @@
+mk_source_dir ${SOURCE_DIRECTORY} &&
+unpack_file	&&
+cd ${SOURCE_DIRECTORY}	&&
+patch -p1 < ${SCRIPT_DIRECTORY}/evolution-sharp-0.11.1-evo28.patch &&
+autoreconf 
+    
\ No newline at end of file
diff --git a/gnome2-libs/evolution-sharp/evolution-sharp-0.11.1-evo28.patch b/gnome2-libs/evolution-sharp/evolution-sharp-0.11.1-evo28.patch
new file mode 100644
index 0000000..2da3bdc
--- /dev/null
+++ b/gnome2-libs/evolution-sharp/evolution-sharp-0.11.1-evo28.patch
@@ -0,0 +1,53 @@
+--- evolution-sharp-0.11.1/configure.in.evo28	2006-09-12 00:45:44.000000000 -0400
++++ evolution-sharp-0.11.1/configure.in	2006-09-12 00:45:44.000000000 -0400
+@@ -15,6 +15,7 @@
+ PKG_CHECK_MODULES(EDS12, evolution-data-server-1.2 >= 1.2, edsver="1.2", foo=bar)
+ PKG_CHECK_MODULES(EDS14, evolution-data-server-1.2 >= 1.4, edsver="1.4", foo=bar)
+ PKG_CHECK_MODULES(EDS16, evolution-data-server-1.2 >= 1.6, edsver="1.6", foo=bar)
++PKG_CHECK_MODULES(EDS18, evolution-data-server-1.2 >= 1.8, edsver="1.8", foo=bar)
+ 
+ if test "x$edsver" = "x"; then
+ 	AC_MSG_ERROR([You need an evolution-data-server 1.2.x, 1.4.x, or 1.6.x development environment])
+@@ -41,6 +42,13 @@
+ 	ECAL_SOVERSION=3
+ fi
+ 
++if test "x$edsver" = "x1.8"; then
++	EDS_VERSION=-1.2
++	EDS_SOVERSION=7
++	EBOOK_SOVERSION=9
++	ECAL_SOVERSION=7
++fi
++
+ AC_SUBST(EDS_VERSION)
+ AC_SUBST(EDS_SOVERSION)
+ AC_SUBST(EBOOK_SOVERSION)
+@@ -49,6 +57,7 @@
+ AM_CONDITIONAL(USE_EDS12, test "x$edsver" = "x1.2")
+ AM_CONDITIONAL(USE_EDS14, test "x$edsver" = "x1.4")
+ AM_CONDITIONAL(USE_EDS16, test "x$edsver" = "x1.6")
++AM_CONDITIONAL(USE_EDS18, test "x$edsver" = "x1.8")
+ 
+ PKG_CHECK_MODULES(MONO, mono >= 1.0.0)
+ AC_PATH_PROG(CSC, mcs, no)
+@@ -122,6 +131,7 @@
+ PKG_CHECK_MODULES(ESHELL22, "evolution-shell-2.2", eshellver="2.2", foo=bar)
+ PKG_CHECK_MODULES(ESHELL24, "evolution-shell-2.4", eshellver="2.4", foo=bar)
+ PKG_CHECK_MODULES(ESHELL26, "evolution-shell-2.6", eshellver="2.6", foo=bar)
++PKG_CHECK_MODULES(ESHELL28, "evolution-shell-2.8", eshellver="2.8", foo=bar)
+ 
+ if test "x$eshellver" = "x"; then
+ 	AC_MSG_ERROR([You need to install evolution-shell])
+--- evolution-sharp-0.11.1/evolution/Makefile.am.evo28	2006-09-12 00:46:17.000000000 -0400
++++ evolution-sharp-0.11.1/evolution/Makefile.am	2006-09-12 00:46:33.000000000 -0400
+@@ -12,6 +12,10 @@
+ RAW_API = evolution-api-1.6.raw
+ endif
+ 
++if USE_EDS18
++RAW_API = evolution-api-1.6.raw
++endif
++
+ API=evolution-api.xml
+ METADATA = Evolution.metadata
+ ASSEMBLY_NAME = evolution-sharp
diff --git a/libs/libgalago/DEPENDS b/libs/libgalago/DEPENDS
index 7149b91..160ff59 100755
--- a/libs/libgalago/DEPENDS
+++ b/libs/libgalago/DEPENDS
@@ -1 +1,3 @@
-depends dbus-glib
+depends glib2      &&
+depends dbus       &&
+depends dbus-glib  
diff --git a/libs/libgalago/DETAILS b/libs/libgalago/DETAILS
index 06de75d..655f688 100755
--- a/libs/libgalago/DETAILS
+++ b/libs/libgalago/DETAILS
@@ -1,13 +1,12 @@
            SPELL=libgalago
-         VERSION=0.3.3
-          SOURCE=$SPELL-$VERSION.tar.gz
+         VERSION=0.5.1
+          SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
     SOURCE_URL[0]=http://www.galago-project.org/files/releases/source/$SPELL/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
       LICENSE[0]=GPL
         WEB_SITE=http://www.galago-project.org
          ENTERED=20050821
-      PATCHLEVEL=1
         KEYWORDS="libs"
            SHORT="Library used for communicating with the Galago framework"
 cat << EOF
diff --git a/libs/libgalago/HISTORY b/libs/libgalago/HISTORY
index 56407d6..37dcc95 100644
--- a/libs/libgalago/HISTORY
+++ b/libs/libgalago/HISTORY
@@ -1,3 +1,12 @@
+2006-09-30 Robin Cook <rcook at wyrms.net>
+	* DETAILS: updated VERSION to 0.5.1
+	  changed SOURCE to bz2
+	* DEPENDS: added glib2
+	  added dbus and missing &&
+	* PRE_BUILD: removed dbus 0.9x sedit
+	  added applying patch 
+	  http://trac.galago-project.org/ticket/62#preview
+
 2006-07-27 Flavien Bridault <vlaaad at sourcemage.org>
 	* DEPENDS: now depends on dbus-glib instead of dbus, removed glib2
 	* DETAILS: PATCHLEVEL++
diff --git a/libs/libgalago/PRE_BUILD b/libs/libgalago/PRE_BUILD
index 737e059..9b7b138 100755
--- a/libs/libgalago/PRE_BUILD
+++ b/libs/libgalago/PRE_BUILD
@@ -1,5 +1,4 @@
 default_pre_build                     &&
 cd ${SOURCE_DIRECTORY}                &&
-# Fix for dbus 0.9X
-sedit "s/dbus_connection_disconnect/dbus_connection_close/" \
-libgalago/galago-core.c
+
+patch -p1 < ${SCRIPT_DIRECTORY}/libgalago-0.5.1-mkinstalldirs.patch
diff --git a/libs/libgalago/libgalago-0.3.3.tar.gz.sig b/libs/libgalago/libgalago-0.3.3.tar.gz.sig
deleted file mode 100644
index b809b89..0000000
Binary files a/libs/libgalago/libgalago-0.3.3.tar.gz.sig and /dev/null differ
diff --git a/libs/libgalago/libgalago-0.5.1-mkinstalldirs.patch b/libs/libgalago/libgalago-0.5.1-mkinstalldirs.patch
new file mode 100644
index 0000000..f0f356e
--- /dev/null
+++ b/libs/libgalago/libgalago-0.5.1-mkinstalldirs.patch
@@ -0,0 +1,24 @@
+--- libgalago-0.5.1/po/Makefile.in.in.orig-mkinstalldirs	2006-05-17 12:03:58 +0400
++++ libgalago-0.5.1/po/Makefile.in.in	2006-06-05 02:08:52 +0400
+@@ -28,8 +28,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++mkinstalldirs = @MKINSTALLDIRS@
+ 
+ CC = @CC@
+ GMSGFMT = @GMSGFMT@
+--- libgalago-0.5.1/intl/Makefile.in.orig-mkinstalldirs	2006-05-17 12:03:56 +0400
++++ libgalago-0.5.1/intl/Makefile.in	2006-06-05 02:08:03 +0400
+@@ -39,8 +39,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++mkinstalldirs = @MKINSTALLDIRS@
+ 
+ l = @INTL_LIBTOOL_SUFFIX_PREFIX@
+ 
diff --git a/libs/libgalago/libgalago-0.5.1.tar.bz2.sig b/libs/libgalago/libgalago-0.5.1.tar.bz2.sig
new file mode 100644
index 0000000..d9badcd
Binary files /dev/null and b/libs/libgalago/libgalago-0.5.1.tar.bz2.sig differ
diff --git a/utils/galago-daemon/DEPENDS b/utils/galago-daemon/DEPENDS
new file mode 100755
index 0000000..a63f7bc
--- /dev/null
+++ b/utils/galago-daemon/DEPENDS
@@ -0,0 +1,3 @@
+depends glib2
+depends dbus
+depends dbus-glib
diff --git a/utils/galago-daemon/DETAILS b/utils/galago-daemon/DETAILS
new file mode 100755
index 0000000..98f676d
--- /dev/null
+++ b/utils/galago-daemon/DETAILS
@@ -0,0 +1,14 @@
+           SPELL=galago-daemon
+         VERSION=0.5.0
+          SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+    SOURCE_URL[0]=http://www.galago-project.org/files/releases/source/$SPELL/$SOURCE
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+      LICENSE[0]=GPL
+        WEB_SITE=http://www.galago-project.org
+         ENTERED=20060930
+        KEYWORDS="utils desktop presence"
+           SHORT="The daemon that handles all presence and account information."
+cat << EOF
+The daemon that handles all presence and account information.
+EOF
diff --git a/utils/galago-daemon/HISTORY b/utils/galago-daemon/HISTORY
new file mode 100644
index 0000000..eec9292
--- /dev/null
+++ b/utils/galago-daemon/HISTORY
@@ -0,0 +1,3 @@
+2006-09-30 Robin Cook <rcook at wyrms.net>
+	* Initial spell v0.5.0
+
diff --git a/utils/galago-daemon/galago-daemon-0.5.0.tar.bz2.sig b/utils/galago-daemon/galago-daemon-0.5.0.tar.bz2.sig
new file mode 100644
index 0000000..f491745
Binary files /dev/null and b/utils/galago-daemon/galago-daemon-0.5.0.tar.bz2.sig differ



More information about the SM-Commit mailing list