Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (a53db384405b193a13d3605aeba76022987be011)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (a53db384405b193a13d3605aeba76022987be011)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (a53db384405b193a13d3605aeba76022987be011)
  • Date: Wed, 19 Mar 2014 10:39:34 -0500
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

http/firefox/DEPENDS | 5 +++++
http/firefox/DETAILS | 13 +++----------
http/firefox/HISTORY | 7 +++++++
http/firefox/PREPARE | 6 ++----
http/firefox/PRE_BUILD | 4 ----
http/firefox/glyph.patch | 15 ---------------
science/qlandkarte-gt/DETAILS | 6 +++---
science/qlandkarte-gt/HISTORY | 3 +++
smgl/firefox-smglwiki/HISTORY | 3 +++
smgl/firefox-smglwiki/INSTALL | 5 ++---
10 files changed, 28 insertions(+), 39 deletions(-)

New commits:
commit a53db384405b193a13d3605aeba76022987be011
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

smgl/firefox-smglwiki: fix install path

commit f154204e789af6ade6a2b1293d19fbc8ddf7e629
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

http/firefox: version 28.0

commit ab4630652345a8cc07c7137649471b4310af7832
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/qlandkarte-gt: version 1.7.6

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index bb2eebd..430f12e 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -31,6 +31,11 @@ optional_depends 'wireless_tools' \
'--disable-necko-wifi' \
'for Necko WiFi scanning' &&

+optional_depends 'pulseaudio' \
+ '--enable-pulseaudio' \
+ '--disable-pulseaudio' \
+ 'use pulseaudio for audio support' &&
+
# Firefox is currently borked and does not compile without alsa-lib headers,
# this should have been fixed when Firefox started using Mozilla core 23,
but it
# wasn't see https://bugzilla.mozilla.org/show_bug.cgi?id=875268
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 6f51359..9b76ba8 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,18 +1,11 @@
SPELL=firefox
-if [[ $FIREFOX_CVS == y ]]; then
- VERSION=27.0.1
+ VERSION=28.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:5c51ff422ff1b02b5542622baec27ced5a543b141f6c129a4c12b2644a719e27d1e1ad92a12f0d4d9d23d1ed033f24b4ca46e9f1e8737c89dd633b66c86429ee
-
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
-else
- VERSION=27.0.1
- SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:5c51ff422ff1b02b5542622baec27ced5a543b141f6c129a4c12b2644a719e27d1e1ad92a12f0d4d9d23d1ed033f24b4ca46e9f1e8737c89dd633b66c86429ee
+
SOURCE_HASH=sha512:9334b45d8b56829e7061b87c377aae80e48060e127dfc3eb6a6996590dd92268bd0273203094cdf9aa22fda8128ab9ed1e5fd6fee3e93a430359c0a0631090f7

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}

SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
-fi
- SECURITY_PATCH=72
+ SECURITY_PATCH=73
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/
GATHER_DOCS=off
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index ce7b298..2c0762b 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,10 @@
+2014-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 28.0
+ * DETAILS, PREPARE: removed support for cvs version since there
hasn't been
+ one in quite some time
+ * glyph.patch, PRE_BUILD: removed patch that does not apply anymore
+ * DEPENDS: added optional dependency on pulseaudio
+
2014-02-27 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: optional depends gstreamer

diff --git a/http/firefox/PREPARE b/http/firefox/PREPARE
index b4b132a..582516a 100755
--- a/http/firefox/PREPARE
+++ b/http/firefox/PREPARE
@@ -1,13 +1,11 @@
#
# Remove persistent variables for SOURCE and VERSION (Bug #8081)
#
-persistent_remove FIREFOX_VERSION FIREFOX_SOURCE &&
+persistent_remove FIREFOX_VERSION FIREFOX_SOURCE FIREFOX_CVS &&

#
# This should fix Bug #8081
#
if grep -q -- "PR" $INSTALL_ROOT/etc/sorcery/local/depends/firefox;
then
rm -f $INSTALL_ROOT/etc/sorcery/local/depends/firefox
-fi &&
-
-config_query FIREFOX_CVS "Build the devel version?" n
+fi
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index e3142bb..6d4f7c4 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -3,10 +3,6 @@ cd $SOURCE_DIRECTORY &&
unpack_file '' &&
cd mozilla* &&

-#Fedora patch to remove glyph in title bar
-# http://osdir.com/ml/scm-fedora-commits/2011-06/msg10320.html
-patch -p0 < $SPELL_DIRECTORY/glyph.patch &&
-
# Archlinux patch to drop release point from install path
#
http://projects.archlinux.org/svntogit/packages.git/plain/trunk/firefox-install-dir.patch?h=packages/firefox
patch -p1 < $SPELL_DIRECTORY/install_dir.patch &&
diff --git a/http/firefox/glyph.patch b/http/firefox/glyph.patch
deleted file mode 100644
index 58b2e97..0000000
--- a/http/firefox/glyph.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up browser/base/Makefile.in.fu browser/base/Makefile.in
---- browser/base/Makefile.in.fu 2011-07-01 22:40:52.048773336 -0300
-+++ browser/base/Makefile.in 2011-07-01 22:42:30.866213879 -0300
-@@ -61,10 +61,9 @@
-
- include $(topsrcdir)/config/rules.mk
-
--PRE_RELEASE_SUFFIX := ""
-+PRE_RELEASE_SUFFIX :=
-
- DEFINES += \
-- -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
- -DAPP_LICENSE_BLOCK=$(abs_srcdir)/content/overrides/app-license.html \
- -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)" \
- $(NULL)
diff --git a/science/qlandkarte-gt/DETAILS b/science/qlandkarte-gt/DETAILS
index c24f003..3aefc2f 100755
--- a/science/qlandkarte-gt/DETAILS
+++ b/science/qlandkarte-gt/DETAILS
@@ -1,8 +1,8 @@
SPELL=qlandkarte-gt
- VERSION=1.7.5
+ VERSION=1.7.6
SOURCE="qlandkartegt-${VERSION}.tar.gz"
-
SOURCE_URL[0]=http://garr.dl.sourceforge.net/project/qlandkartegt/qlandkartegt/QLandkarteGT%20${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:c68e98b5cbba0fa535e3a2e32566a2451ad602da651a0dade2ba61c040f1c91f9dabad23bdac0d0fcd5cc3ef71394743a5fa10fdd9dd5865b9a32650e808c2f2
+
SOURCE_URL[0]=http://downloads.sourceforge.net/project/qlandkartegt/qlandkartegt/QLandkarte%20GT%20${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:15c96a04979666ccafe9badeed5a6973fdeb49339a707adf20b06d76292d5f23042f541276bc7fc1b390d70a3f5db033f749d2bed30e348c472196622dd3c275
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/qlandkartegt-${VERSION}"
WEB_SITE="http://www.qlandkarte.org/";
LICENSE[0]=GPL
diff --git a/science/qlandkarte-gt/HISTORY b/science/qlandkarte-gt/HISTORY
index 3e1ca23..f9e4928 100644
--- a/science/qlandkarte-gt/HISTORY
+++ b/science/qlandkarte-gt/HISTORY
@@ -1,3 +1,6 @@
+2014-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.7.6
+
2013-11-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.7.5

diff --git a/smgl/firefox-smglwiki/HISTORY b/smgl/firefox-smglwiki/HISTORY
index a9b0227..e0c8309 100644
--- a/smgl/firefox-smglwiki/HISTORY
+++ b/smgl/firefox-smglwiki/HISTORY
@@ -1,3 +1,6 @@
+2014-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * INSTALL: fixed install path
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/smgl/firefox-smglwiki/INSTALL b/smgl/firefox-smglwiki/INSTALL
index a7b1197..795f8e4 100755
--- a/smgl/firefox-smglwiki/INSTALL
+++ b/smgl/firefox-smglwiki/INSTALL
@@ -1,3 +1,2 @@
-cd $SOURCE_DIRECTORY &&
-cp ./smgl_wiki.src $INSTALL_ROOT/usr/lib/firefox/searchplugins/ &&
-cp ./smgl_wiki.png $INSTALL_ROOT/usr/lib/firefox/searchplugins/
+cd $SOURCE_DIRECTORY
&&
+install -m644 smgl_wiki.png smgl_wiki.src
$INSTALL_ROOT/usr/lib/firefox/browser/searchplugins/


  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (a53db384405b193a13d3605aeba76022987be011), Florian Franzmann, 03/19/2014

Archive powered by MHonArc 2.6.24.

Top of Page