Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (79313a0e74cb286536519a6dc475bef4a5de1107)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vasil Yonkov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (79313a0e74cb286536519a6dc475bef4a5de1107)
  • Date: Thu, 22 Apr 2010 10:05:45 -0500

GIT changes to master grimoire by Vasil Yonkov <spirtbrat AT sourcemage.org>:

gnome2-apps/evolution/BUILD | 3
gnome2-apps/evolution/CONFIGURE | 16 -
gnome2-apps/evolution/DEPENDS | 99
++++++-----
gnome2-apps/evolution/HISTORY | 7
gnome2-libs/evolution-data-server/DEPENDS | 8
gnome2-libs/evolution-data-server/HISTORY | 4
gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS | 2
gnome2-libs/evolution-data-server/REPAIR^all^PRE_SUB_DEPENDS | 8
gnome2-libs/evolution-data-server/SUB_DEPENDS | 4
mail/readpst/DETAILS | 2
mail/readpst/HISTORY | 3
printer/glabels/DEPENDS | 14 +
printer/glabels/HISTORY | 3
13 files changed, 109 insertions(+), 64 deletions(-)

New commits:
commit 79313a0e74cb286536519a6dc475bef4a5de1107
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

evolution-data-server: added subdependency handlers for calendar
components

commit ce0b2e49de03987187cc736d6eceb5bfaaead443
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

evolution: depends on evolution-data-server with calendar components

commit 5d4c7d15e444b2791db31afe0143aa53a9aa9793
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

readpst: fixed SOURCE_URL[0]

commit 3b024811133916d38341782873ea4acea981d668
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

evolution: removed dependency on orbit2, psmisc, libproxy,
depends on intltool, optionaly depends on gstreamer,
libcanberra,
readpst, libgweather, libchamplain, geoclue, clutter-gtk,
removed EVOLUTION_NNTP, EVOLUTION_EXCHANGE

commit 5d208fa52ed618678442e063c38cb3382bcacf11
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

evolution-data-server: removed dependency on popt, avahi,
depends on intltool, dbus-glib

commit aec9b9c221580e199a5b8d47cd0d20039df413f1
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

glabels: added dependency on intltool,
optionaly depends on gtk-doc, evolution-data-server

diff --git a/gnome2-apps/evolution/BUILD b/gnome2-apps/evolution/BUILD
index 300dae3..20ca704 100755
--- a/gnome2-apps/evolution/BUILD
+++ b/gnome2-apps/evolution/BUILD
@@ -1,5 +1,4 @@
-OPTS="$EVOLUTION_NNTP $EVOLUTION_EXCHANGE $OPTS" &&
OPTS="--enable-plugins=$EVOLUTION_PLUGINS $OPTS" &&
-OPTS="--disable-nm --disable-pst-import $OPTS" &&
+OPTS="--disable-nm $OPTS" &&

default_build
diff --git a/gnome2-apps/evolution/CONFIGURE b/gnome2-apps/evolution/CONFIGURE
index 856c47e..87f3d7c 100755
--- a/gnome2-apps/evolution/CONFIGURE
+++ b/gnome2-apps/evolution/CONFIGURE
@@ -1,16 +1,2 @@
-#if [[ -z $IPV6 ]]; then
-# persistent_read evolution2 NNTP EVOLUTION_NNTP
-# persistent_read evolution2 PLUGINS EVOLUTION_PLUGINS
-# persistent_add EVOLUTION_IPV6 EVOLUTION_NNTP EVOLUTION_PLUGINS
-#fi
-
-config_query_option EVOLUTION_NNTP "Build Usenet news (NNTP) backend" y \
- "--enable-nntp" "--disable-nntp" &&
-
-config_query_option EVOLUTION_EXCHANGE "Build Exchange plugin?" n \
- "--enable-exchange" "--disable-exchange" &&
-
config_query_list EVOLUTION_PLUGINS "Enable Plugins?" \
- all base experimental no
-
-
+ all base experimental no
diff --git a/gnome2-apps/evolution/DEPENDS b/gnome2-apps/evolution/DEPENDS
index 43e1a10..3b64903 100755
--- a/gnome2-apps/evolution/DEPENDS
+++ b/gnome2-apps/evolution/DEPENDS
@@ -1,4 +1,3 @@
-#depends hal &&
depends libx11 &&
depends libxml2 &&
depends -sub PYTHON libxml2 &&
@@ -11,29 +10,13 @@ depends gtk+2 &&
depends gtkhtml2 &&
depends gconf2 &&
depends atk &&
-depends orbit2 &&
depends libgnomecanvas &&
-depends evolution-data-server &&
+depends -sub CC evolution-data-server &&
depends gnome-icon-theme &&
depends libnotify &&
depends libsoup &&
-depends gstreamer &&
-depends psmisc &&
-depends libproxy &&
depends unique &&
-depends -sub "GTK" libcanberra &&
-
-optional_depends gnome-spell '' '' 'Enable spelling checker?' &&
-
-optional_depends gnupg \
- "" \
- "" \
- "To encrypted mail support?" &&
-
-#optional_depends "openssl" \ Seems to have been
removed as an option...
-# "--enable-openssl=yes" \
-# "--enable-openssl=no" \
-# "Enable OpenSSL support" &&
+depends intltool &&

optional_depends nss \
"--enable-nss=yes --enable-smime \
@@ -76,23 +59,61 @@ optional_depends gtk-doc
\
"--disable-gtk-doc" \
"Enable gtk-doc documenation building" &&

-optional_depends avahi \
- "" \
- "" \
- "for service discovery" &&
-
-optional_depends rarian \
- "--enable-scrollkeeper" \
- "--disable-scrollkeeper" \
- "Register with rarian?" &&
-
-optional_depends gtkimageview \
- "" \
- "--disable-image-inline" \
- "enable the image-inline plugin?"
-
-# seems broken, disabled in BUILD for now
-#optional_depends readpst \
-# "--enable-pst-import" \
-# "--disable-pst-import" \
-# "enable the pst-import plugin?"
+optional_depends rarian \
+ "--enable-scrollkeeper" \
+ "--disable-scrollkeeper" \
+ "Register with rarian?" &&
+
+optional_depends gtkimageview \
+ "--enable-image-inline" \
+ "--disable-image-inline" \
+ "for image-inline plugin" &&
+
+optional_depends readpst \
+ "--enable-pst-import" \
+ "--disable-pst-import" \
+ "for pst-import plugin" &&
+
+optional_depends gstreamer \
+ "--enable-audio-inline" \
+ "--disable-audio-inline" \
+ "for audio-inline plugin" &&
+
+optional_depends libgweather \
+ "--enable-weather" \
+ "--disable-weather" \
+ "for calendar-weather plugin" &&
+
+optional_depends libchamplain \
+ "--enable-contacts-map" \
+ "--disable-contacts-map" \
+ "for contacts-map plugin" &&
+
+if is_depends_enabled $SPELL libchamplain; then
+ depends geoclue &&
+ depends clutter-gtk
+fi &&
+
+optional_depends libcanberra \
+ "--enable-canberra" \
+ "--disable-canberra" \
+ "for Canberra-GTK sound support" &&
+
+if is_depends_enabled $SPELL libcanberra; then
+ depends -sub GTK libcanberra
+fi &&
+
+optional_depends gnome-spell \
+ "" \
+ "" \
+ "for spellcheck (runtime)" &&
+
+optional_depends gnupg \
+ "" \
+ "" \
+ "for encrypted mail support (runtime)" &&
+
+optional_depends avahi \
+ "" \
+ "" \
+ "for service discovery (runtime)"
diff --git a/gnome2-apps/evolution/HISTORY b/gnome2-apps/evolution/HISTORY
index db6a93e..cd3f2e2 100644
--- a/gnome2-apps/evolution/HISTORY
+++ b/gnome2-apps/evolution/HISTORY
@@ -1,3 +1,10 @@
+2010-04-22 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * BUILD, CONFIGURE: removed EVOLUTION_NNTP, EVOLUTION_EXCHANGE
+ * DEPENDS: removed orbit2, psmisc, libproxy, made gstreamer and
+ libcanberra optional, added intltool, added optional readpst,
+ libgweather, libchamplain, geoclue, clutter-gtk,
+ depends on evolution-data-server with calendar components
+
2010-04-09 Robin Cook <rcook AT wyrms.net>
* DEPENDS: removed libbonobo, libbonoboui, libgnomeui,
libglade2, libgnomeprintui
diff --git a/gnome2-libs/evolution-data-server/DEPENDS
b/gnome2-libs/evolution-data-server/DEPENDS
index 463e782..f6655f1 100755
--- a/gnome2-libs/evolution-data-server/DEPENDS
+++ b/gnome2-libs/evolution-data-server/DEPENDS
@@ -4,8 +4,9 @@ depends gconf2 &&
depends libxml2 &&
depends sqlite &&
depends libsoup &&
-depends popt &&
depends libical &&
+depends intltool &&
+depends dbus-glib &&

optional_depends "gtk-doc" \
"--enable-gtk-doc" \
@@ -31,11 +32,6 @@ optional_depends "krb5"
\
"--without-krb5" \
"Enable kerberos 5 support?" &&

-optional_depends avahi \
- "" \
- "" \
- "for service discovery" &&
-
optional_depends gnome-keyring \
"--enable-gnome-keyring=yes" \
"--enable-gnome-keyring=no" \
diff --git a/gnome2-libs/evolution-data-server/HISTORY
b/gnome2-libs/evolution-data-server/HISTORY
index 2b026bc..11bbb31 100644
--- a/gnome2-libs/evolution-data-server/HISTORY
+++ b/gnome2-libs/evolution-data-server/HISTORY
@@ -1,3 +1,7 @@
+2010-04-22 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed popt, avahi, added intltool, dbus-glib
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: added CC
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS
b/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS
index 70cb798..bcea801 100755
--- a/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS
+++ b/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS
@@ -2,5 +2,7 @@ case $THIS_SUB_DEPENDS in
LDAP) persistent_read openldap OPENLDAP_NTLM OPENLDAP_NTLM &&
is_depends_enabled $SPELL openldap &&
[[ OPENLDAP_NTLM == "y" ]] &&return 0;;
+ CC) persistent_read CAL &&
+ if [[ $CAL == "--enable-calendar=yes" ]]; then return 0; fi ;;
esac
return 1
diff --git a/gnome2-libs/evolution-data-server/REPAIR^all^PRE_SUB_DEPENDS
b/gnome2-libs/evolution-data-server/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..b6ecacb
--- /dev/null
+++ b/gnome2-libs/evolution-data-server/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ LDAP) persistent_read openldap OPENLDAP_NTLM OPENLDAP_NTLM &&
+ is_depends_enabled $SPELL openldap &&
+ [[ OPENLDAP_NTLM == "y" ]] &&return 0;;
+ CAL) persistent_read CAL &&
+ if [[ $CAL == "--enable-calendar=yes" ]]; then return 0; fi ;;
+esac
+return 1
diff --git a/gnome2-libs/evolution-data-server/SUB_DEPENDS
b/gnome2-libs/evolution-data-server/SUB_DEPENDS
index 0c5c32e..53f4a49 100755
--- a/gnome2-libs/evolution-data-server/SUB_DEPENDS
+++ b/gnome2-libs/evolution-data-server/SUB_DEPENDS
@@ -2,4 +2,8 @@ case $THIS_SUB_DEPENDS in
LDAP)
depends -sub NTLM openldap --with-openldap=yes "(because sub depends
forced it)"
;;
+ CC) persistent_add CAL &&
+ message "Calendar components requested, forcing build" &&
+ CAL="--enable-calendar=yes"
+ ;;
esac
diff --git a/mail/readpst/DETAILS b/mail/readpst/DETAILS
index c05aa3c..f6e74af 100755
--- a/mail/readpst/DETAILS
+++ b/mail/readpst/DETAILS
@@ -1,7 +1,7 @@
SPELL=readpst
VERSION=0.5.3
SOURCE=libpst-${VERSION}.tar.gz
- SOURCE_URL[0]=http://alioth.debian.org/download.php/844/${SOURCE}
+ SOURCE_URL[0]=http://alioth.debian.org/download.php/2492/${SOURCE}

SOURCE_HASH=sha512:2fb2c338201ffd996f3a1c422da6defe39e330440ab9cad1e146074e9fa41942be11e328437bf65cb44b520ce0d11fc70b74fcb73b5ca07e19a78842d735fe5b
SOURCE_DIRECTORY=$BUILD_DIRECTORY/libpst-${VERSION}
WEB_SITE=http://alioth.debian.org/projects/libpst/
diff --git a/mail/readpst/HISTORY b/mail/readpst/HISTORY
index 0fa4e58..686fdcb 100644
--- a/mail/readpst/HISTORY
+++ b/mail/readpst/HISTORY
@@ -1,3 +1,6 @@
+2010-04-22 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DETAILS: fixed SOURCE_URL[0]
+
2010-04-01 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 0.5.3
* attempt to let evolution use it, no luck
diff --git a/printer/glabels/DEPENDS b/printer/glabels/DEPENDS
index 543aa91..d6dd79b 100755
--- a/printer/glabels/DEPENDS
+++ b/printer/glabels/DEPENDS
@@ -1,3 +1,5 @@
+depends intltool &&
+depends glib2 &&
depends pkgconfig &&
depends gtk+2 &&
depends libxml2 &&
@@ -5,4 +7,14 @@ depends libglade2 &&
depends libgnomeui &&
depends libgnome &&
depends shared-mime-info &&
-depends desktop-file-utils
+depends desktop-file-utils &&
+
+optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "to build documentation" &&
+
+optional_depends evolution-data-server \
+ "--with-libebook" \
+ "--without-libebook" \
+ "for Evolution Data Server support"
diff --git a/printer/glabels/HISTORY b/printer/glabels/HISTORY
index 0b7a848..91295b5 100644
--- a/printer/glabels/HISTORY
+++ b/printer/glabels/HISTORY
@@ -1,3 +1,6 @@
+2010-04-22 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: added intltool, added optional gtk-doc,
evolution-data-server
+
2010-04-21 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.2.8




  • [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (79313a0e74cb286536519a6dc475bef4a5de1107), Vasil Yonkov, 04/22/2010

Archive powered by MHonArc 2.6.24.

Top of Page