Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.43 grimoire by Arwed von Merkatz (2f1d430e82644973077d524da0038718060ae89c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.43 grimoire by Arwed von Merkatz (2f1d430e82644973077d524da0038718060ae89c)
  • Date: Fri, 2 Apr 2010 06:49:41 -0500

GIT changes to stable-rc-0.43 grimoire by Arwed von Merkatz
<v.merkatz AT gmx.net>:

gnome2-apps/epiphany/DEPENDS | 7 ++++++-
gnome2-apps/epiphany/DETAILS | 3 +--
gnome2-apps/epiphany/HISTORY | 6 ++++++
gnome2-libs/libgnome-keyring/DEPENDS | 1 +
gnome2-libs/libgnome-keyring/HISTORY | 3 +++
http/webkitgtk/HISTORY | 4 ++++
http/webkitgtk/PRE_SUB_DEPENDS | 4 ++++
http/webkitgtk/REPAIR^none^PRE_SUB_DEPENDS | 4 ++++
http/webkitgtk/SUB_DEPENDS | 5 +++++
9 files changed, 34 insertions(+), 3 deletions(-)

New commits:
commit 2f1d430e82644973077d524da0038718060ae89c
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

epiphany: added optional_depends on ca-certificates
(cherry picked from commit 1376d3a19b4b2483f822edd58e154f89af5671de)

commit cc38562d627549a2c24e173dc7104c1bbd35b48f
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

epiphany: sub_depend on WEBKIT_DEVEL for webkitgtk
(cherry picked from commit 4d31c52d1aaa076ee9a7ef417161a278c78da0f1)

commit 82995113c300d59c99357ab455f8e968357501d9
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

webkitgtk: added WEBKIT_DEVEL sub dependency
(cherry picked from commit 1078ba926e613339dcc6551b2806075e50fc495e)

commit b40b9ec18ae27089635b6551ef79bdd0349f0ff3
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

epiphany: fixed SOURCE_GPG location in DETAILS
(cherry picked from commit e3c305ae858de4dfbf6c1fbfcddac2a10f06c870)

commit fb6d59c3004278d1ec606d0596fadc4ca4f1200f
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

libgnome-keyring: needs eggdbus
(cherry picked from commit b92a8f684d3e43ecd8ca62ecf69aa2fa1716d2d0)

diff --git a/gnome2-apps/epiphany/DEPENDS b/gnome2-apps/epiphany/DEPENDS
index 6cfd114..bf06e7b 100755
--- a/gnome2-apps/epiphany/DEPENDS
+++ b/gnome2-apps/epiphany/DEPENDS
@@ -1,12 +1,17 @@
depends iso-codes &&
depends dbus-glib &&
-depends webkitgtk &&
+depends -sub WEBKIT_DEVEL webkitgtk &&
depends startup-notification &&
depends libgnome-keyring &&
depends -sub SOUP_GNOME libsoup &&
depends libxslt &&
depends libproxy &&

+optional_depends ca-certificates \
+ "" \
+ "--without-ca-file" \
+ "for SSL root certificates" &&
+
optional_depends gnome-network \
"--enable-network-manager" \
"--disable-network-manager" \
diff --git a/gnome2-apps/epiphany/DETAILS b/gnome2-apps/epiphany/DETAILS
index 471f292..bfbf503 100755
--- a/gnome2-apps/epiphany/DETAILS
+++ b/gnome2-apps/epiphany/DETAILS
@@ -1,13 +1,12 @@
SPELL=epiphany
if [[ "$EPIPHANY_DEVEL" == "y" ]]; then
VERSION=2.30.0
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
else
VERSION=2.30.0
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
fi
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
LICENSE[0]=GPL
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index 76edc50..e1a7010 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,9 @@
+2010-04-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: moved SOURCE_GPG after definition of SOURCE so it actually
+ works
+ * DEPENDS: added sub_depends on WEBKIT_DEVEL for webkitgtk >= 1.1.22,
+ added optional_depends on ca-certificates
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated EPIPHANY_DEVEL=n to 2.30.0
updated EPIPHANY_DEVEL=y to 2.30.0
diff --git a/gnome2-libs/libgnome-keyring/DEPENDS
b/gnome2-libs/libgnome-keyring/DEPENDS
index a76b513..35a5c82 100755
--- a/gnome2-libs/libgnome-keyring/DEPENDS
+++ b/gnome2-libs/libgnome-keyring/DEPENDS
@@ -1,6 +1,7 @@
depends glib2 &&
depends dbus &&
depends libgcrypt &&
+depends eggdbus &&

optional_depends gtk-doc \
"--enable-gtk-doc" \
diff --git a/gnome2-libs/libgnome-keyring/HISTORY
b/gnome2-libs/libgnome-keyring/HISTORY
index e06a8ff..4d7878a 100644
--- a/gnome2-libs/libgnome-keyring/HISTORY
+++ b/gnome2-libs/libgnome-keyring/HISTORY
@@ -1,3 +1,6 @@
+2010-04-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added eggdbus dependency
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0
fixed long description wrap
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 2add63f..1b25576 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,7 @@
+2010-04-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^none^PRE_SUB_DEPENDS: added
+ WEBKIT_DEVEL sub dependency
+
2010-03-24 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated devel to version 1.1.90

diff --git a/http/webkitgtk/PRE_SUB_DEPENDS b/http/webkitgtk/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..4518d9c
--- /dev/null
+++ b/http/webkitgtk/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ WEBKIT_DEVEL) if [[ "$WEBKITGTK_NIGHT" == "y" ]]; then return 0; fi;;
+esac
+return 1
diff --git a/http/webkitgtk/REPAIR^none^PRE_SUB_DEPENDS
b/http/webkitgtk/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..4518d9c
--- /dev/null
+++ b/http/webkitgtk/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ WEBKIT_DEVEL) if [[ "$WEBKITGTK_NIGHT" == "y" ]]; then return 0; fi;;
+esac
+return 1
diff --git a/http/webkitgtk/SUB_DEPENDS b/http/webkitgtk/SUB_DEPENDS
new file mode 100755
index 0000000..a3eaaa6
--- /dev/null
+++ b/http/webkitgtk/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ WEBKIT_DEVEL) echo "Devel release needed, forcing it." &&
+ WEBKITGTK_NIGHT="y" ;;
+ *) echo "unknown sub-depends!"; return 1 ;;
+esac



  • [SM-Commit] GIT changes to stable-rc-0.43 grimoire by Arwed von Merkatz (2f1d430e82644973077d524da0038718060ae89c), Arwed von Merkatz, 04/02/2010

Archive powered by MHonArc 2.6.24.

Top of Page