Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (3a8058f6a64121230fddc7a16bf162dff676b06e)

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 master grimoire by Arwed von Merkatz (3a8058f6a64121230fddc7a16bf162dff676b06e)
  • Date: Fri, 2 Apr 2010 07:29:47 -0500

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

gnome2-apps/epiphany/DEPENDS | 7 ++++++-
gnome2-apps/epiphany/HISTORY | 2 ++
http/webkitgtk/HISTORY | 4 ++++
http/webkitgtk/PRE_SUB_DEPENDS | 4 ++++
http/webkitgtk/REPAIR^none^PRE_SUB_DEPENDS | 4 ++++
http/webkitgtk/SUB_DEPENDS | 5 +++++
video/totem/HISTORY | 3 +++
video/totem/UP_TRIGGERS | 14 --------------
8 files changed, 28 insertions(+), 15 deletions(-)

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

totem: removed unneeded UP_TRIGGERS

commit f133ccb67e2ccf8cd47a22129c37aebe375c7622
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

commit 7ef6ad8fe27823f5e2e29d1a0ec3e331ec9d2227
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

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

webkitgtk: added WEBKIT_DEVEL sub dependency

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/HISTORY b/gnome2-apps/epiphany/HISTORY
index 34f5eb7..e1a7010 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,6 +1,8 @@
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
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
diff --git a/video/totem/HISTORY b/video/totem/HISTORY
index ceb133e..912adc9 100644
--- a/video/totem/HISTORY
+++ b/video/totem/HISTORY
@@ -1,3 +1,6 @@
+2010-04-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * UP_TRIGGERS: removed, totem-pl-parser provides the lib now
+
2010-03-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[1]
updated spell to 2.30.0
diff --git a/video/totem/UP_TRIGGERS b/video/totem/UP_TRIGGERS
deleted file mode 100755
index 0147972..0000000
--- a/video/totem/UP_TRIGGERS
+++ /dev/null
@@ -1,14 +0,0 @@
-local OLD_SPELL_VERSION=""
-if spell_ok $SPELL; then
- OLD_SPELL_VERSION="$(installed_version $SPELL)"
- if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
- message "This is a possibly incompatible update of libtotem-plparser..."
- message "Figuring out what spells need to be recast."
- for each in $(show_up_depends $SPELL 1); do
- if gaze install $each | xargs readelf -d 2> /dev/null |
- grep -q "NEEDED.*libtotem-plparser.so.0"; then
- up_trigger $each cast_self
- fi
- done
- fi
-fi



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (3a8058f6a64121230fddc7a16bf162dff676b06e), Arwed von Merkatz, 04/02/2010

Archive powered by MHonArc 2.6.24.

Top of Page