Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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 (6c96c4bde847dc43799a44645a98794b9320682d)
  • Date: Mon, 28 Apr 2014 16:09:32 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

crypto/nss/BUILD | 4 ++--
crypto/nss/DEPENDS | 2 +-
crypto/nss/DETAILS | 38 ++++++++++----------------------------
crypto/nss/HISTORY | 4 ++++
crypto/nss/INSTALL | 11 +++++++----
crypto/nss/PREPARE | 2 +-
crypto/nss/PRE_BUILD | 4 +++-
crypto/nss/PRE_SUB_DEPENDS | 3 +--
crypto/nss/SUB_DEPENDS | 10 ++++------
haskell/haskell-dataenc/DETAILS | 4 ++--
haskell/haskell-dataenc/HISTORY | 3 +++
haskell/haskell-mtl/DETAILS | 4 ++--
haskell/haskell-mtl/HISTORY | 3 +++
http/firefox/DEPENDS | 2 +-
http/firefox/DETAILS | 4 ++--
http/firefox/HISTORY | 5 +++++
http/firefox/install_dir.patch | 38 ++++++++++++++------------------------
libs/gflags/DETAILS | 6 +++---
libs/gflags/HISTORY | 3 +++
19 files changed, 71 insertions(+), 79 deletions(-)

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

http/firefox: version 29.0

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

crypto/nss: versions 3.14.5, 3.16, remove obsolete branches

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

libs/gflags: pull source from github

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

haskell/haskell-dataenc: version 0.14.0.7

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

haskell/haskell-mtl: version 2.1.3.1

diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD
index dd7249c..6cd185d 100755
--- a/crypto/nss/BUILD
+++ b/crypto/nss/BUILD
@@ -1,5 +1,5 @@
if [ "$NSS_BRANCH" == "DEFAULT" ]; then
- NSS_BRANCH=3.15
+ NSS_BRANCH=3.16
fi &&

MAKE_OPTS="BUILD_OPT=1 NSS_USE_SYSTEM_SQLITE=1 NSS_ENABLE_ECC=1" &&
@@ -9,7 +9,7 @@ if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
MAKE_OPTS="$MAKE_OPTS USE_64=1"
fi &&

-if [[ $NSS_BRANCH == "3.15" ]]; then
+if [[ $NSS_BRANCH == "3.15" || $NSS_BRANCH == "3.16" ]]; then
cd $SOURCE_DIRECTORY/nss &&
MAKE_OPTS="$MAKE_OPTS NSPR_INCLUDE_DIR=/usr/include/nspr USE_SYSTEM_ZLIB=1
ZLIB_LIBS=-lz"
make_single &&
diff --git a/crypto/nss/DEPENDS b/crypto/nss/DEPENDS
index 6c41a13..e1aaed3 100755
--- a/crypto/nss/DEPENDS
+++ b/crypto/nss/DEPENDS
@@ -1,5 +1,5 @@
depends nspr &&
depends perl &&
-if [[ $NSS_BRANCH == "3.15" ]]; then
+if [[ $NSS_BRANCH == "3.15" || $NSS_BRANCH == "3.16" ]]; then
depends zlib
fi
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 6a70fcb..728d9b5 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -1,47 +1,29 @@
SPELL=nss

if [ -z "$NSS_BRANCH" ] || [ "$NSS_BRANCH" == "DEFAULT" ]; then
- NSS_BRANCH=3.15
+ NSS_BRANCH=3.16
fi

case $NSS_BRANCH in
- 3.11)
- VERSION=3.11.9
- SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
-
SOURCE_HASH=sha512:2fe9eafe99c64c57503739cabcd58f8aac29c1f353379c4072c183c0bf0dee3fc7147120ad0fc8fef4dc6fdae542e5068ffca0a7e7d0bcf99d23500d49e9dc35
- PATCHLEVEL=2
- ;;
- 3.12)
- VERSION=3.12.11
- SECURITY_PATCH=3
- PATCHLEVEL=1
- SOURCE=nss-3.12.11.with.ckbi.1.88.tar.gz
-
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_11_WITH_CKBI_1_88_RTM/src/$SOURCE
-
SOURCE_HASH=sha512:19601383313fe6457b1af03161a9902811a77715e8a9a04ec4e70fd8e9685b3883497b7a8c5f877728fea2144c3e14c0d811f13fe1cd39dccd95feb60d3eb57f
- ;;
- 3.13)
- VERSION=3.13.6
- PATCHLEVEL=1
- SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
-
SOURCE_HASH=sha512:45bc254eb238ea23fdd8d2c9128a22cebe15fda9ed5c9c1d112b5756d4d2b76e7f3a99d3600254bdcd6eeb18bda224d52e676e169207193798200f0d41baa29d
- ;;
3.14)
- VERSION=3.14.3
+ VERSION=3.14.5
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
-
SOURCE_HASH=sha512:4e8d8517ffb6d03da274afe9a7c50e2f0a15ffdd83e63f29a445e7aee829a8b7e2fbc772695322bd6acee81c052811735b542978044996156cb52dd7e4c001ec
+
SOURCE_HASH=sha512:ef35939d6b4627df0e562da7b0f1bb599c8f7cf09f7baa9fc059ddd725a91a4d34204a22e05e3aa9b2a609c085834f611f9e6ff2dde69e16e9cd7e7c74a86ddf
;;
3.15)
VERSION=3.15.5

SOURCE_HASH=sha512:4db27ea98f17f1a5bc6f513455497945fc35957f573b3ac7e730b166fbe0e8fd741c188187c578faf361d969db63d83ff8ccf15ac2b8ca72a367f33a018695ca
SECURITY_PATCH=4
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
+ ;;
+ 3.16)
+ VERSION=3.16
+
SOURCE_HASH=sha512:e3dcde8213f7f131fe2f714ff2f45c6d7b9b2167e51dbf0e1a750cc4f83d9fa35e69408850de6600f55fbc9e26b29dc344548cb64849d6e3252476eadd7ee57f
+ SECURITY_PATCH=4
+ SOURCE=$SPELL-$VERSION.tar.gz
;;
esac
-
+
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.mozilla.org/projects/security/pki/nss/
ENTERED=20030919
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index cdd5fed..2da9a04 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,7 @@
+2014-04-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, SUB_DEPENDS, PRE_BUILD, BUILD, DEPENDS, PRE_SUB_DEPENDS:
+ remove obsolete branches, add 3.16 branch, update 3.14 branch to
3.14.5
+
2014-03-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.15.5

diff --git a/crypto/nss/INSTALL b/crypto/nss/INSTALL
index 9e14711..0e7491d 100755
--- a/crypto/nss/INSTALL
+++ b/crypto/nss/INSTALL
@@ -1,8 +1,8 @@
if [ "$NSS_BRANCH" == "DEFAULT" ]; then
- NSS_BRANCH=3.15
+ NSS_BRANCH=3.16
fi &&

-if [[ $NSS_BRANCH == "3.15" ]]; then
+if [[ $NSS_BRANCH == "3.15" || $NSS_BRANCH == "3.16" ]]; then
cd $SOURCE_DIRECTORY/dist
else
cd $SOURCE_DIRECTORY/mozilla/dist
@@ -19,7 +19,7 @@ install -v -m755 */lib/*.chk $INSTALL_ROOT/usr/lib &&
install -v -m755 */lib/*.a $INSTALL_ROOT/usr/lib &&

install -v -d -m755 $INSTALL_ROOT/usr/lib/pkgconfig &&
-if [[ $NSS_BRANCH == "3.15" ]]; then
+if [[ $NSS_BRANCH == "3.15" || $NSS_BRANCH == "3.16" ]]; then
install -v -m644 */lib/pkgconfig/nss.pc $INSTALL_ROOT/usr/lib/pkgconfig
else
install -v -m644 ../security/nss/cmd/disttools/nss.pc
$INSTALL_ROOT/usr/lib/pkgconfig
@@ -27,7 +27,10 @@ fi &&

install -v -d -m755 $INSTALL_ROOT/usr/bin &&
install -v -m755 */bin/* $INSTALL_ROOT/usr/bin &&
-if [[ $NSS_BRANCH != "3.15" ]]; then
+
+if [[ $NSS_BRANCH == "3.16" ]]; then
+ install -v -m755 ../nss/config/nss-config $INSTALL_ROOT/usr/bin
+elif [[ $NSS_BRANCH == "3.15" ]]; then
install -v -m755 ../security/nss/cmd/disttools/nss-config
$INSTALL_ROOT/usr/bin
fi &&

diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index 3b52816..47f9fef 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1 +1 @@
-config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.11 3.12 3.13 3.14 3.15
+config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.14 3.15 3.16
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 429b805..9571ca8 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -2,7 +2,9 @@ default_pre_build &&

cd $SOURCE_DIRECTORY &&

-if [[ $NSS_BRANCH == "3.15" || $NSS_BRANCH == "DEFAULT" ]]; then
+if [[ $NSS_BRANCH == "3.16" || $NSS_BRANCH == "DEFAULT" ]]; then
+ patch -p1 < $SCRIPT_DIRECTORY/nss-3.15.1-standalone-2.patch
+elif [[ $NSS_BRANCH == "3.15" ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.15.1-standalone-2.patch
elif [[ $NSS_BRANCH == "3.14" ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.14-config-1.patch
diff --git a/crypto/nss/PRE_SUB_DEPENDS b/crypto/nss/PRE_SUB_DEPENDS
index ba9efc3..74b4152 100755
--- a/crypto/nss/PRE_SUB_DEPENDS
+++ b/crypto/nss/PRE_SUB_DEPENDS
@@ -1,8 +1,7 @@
case $THIS_SUB_DEPENDS in
- 3.12.x) if [ $NSS_BRANCH == "3.12" ]; then return 0; fi;;
- 3.13.x) if [ $NSS_BRANCH == "3.13" ]; then return 0; fi;;
3.14.x) if [ $NSS_BRANCH == "3.14" ]; then return 0; fi;;
3.15.x) if [ $NSS_BRANCH == "3.15" ]; then return 0; fi;;
+ 3.16.x) if [ $NSS_BRANCH == "3.16" ]; then return 0; fi;;
PEM) if [ $NSS_PEM == "y" ]; then return 0; fi;;
esac
return 1
diff --git a/crypto/nss/SUB_DEPENDS b/crypto/nss/SUB_DEPENDS
index 5a1ad57..620f12a 100755
--- a/crypto/nss/SUB_DEPENDS
+++ b/crypto/nss/SUB_DEPENDS
@@ -1,14 +1,12 @@
case $THIS_SUB_DEPENDS in
- 3.12.x) echo "3.12.x release needed, forcing it." &&
- NSS_BRANCH="3.12" ;;
- 3.13.x) echo "3.13.x release needed, forcing it." &&
- NSS_BRANCH="3.13" ;;
3.14.x) echo "3.14.x release needed, forcing it." &&
NSS_BRANCH="3.14" ;;
3.15.x) echo "3.15.x release needed, forcing it." &&
NSS_BRANCH="3.15" ;;
- PEM) if [[ $NSS_BRANCH == "3.15" ]]; then
- echo "pem is not supported yet for branch 3.15" &&
+ 3.16.x) echo "3.16.x release needed, forcing it." &&
+ NSS_BRANCH="3.16" ;;
+ PEM) if [[ $NSS_BRANCH == "3.16" ]]; then
+ echo "pem is not supported yet for branch $NSS_BRANCH" &&
return 1
else
echo "nss with pem needed, forcing it." &&
diff --git a/haskell/haskell-dataenc/DETAILS b/haskell/haskell-dataenc/DETAILS
index eaec0e6..a2a333d 100755
--- a/haskell/haskell-dataenc/DETAILS
+++ b/haskell/haskell-dataenc/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-dataenc
- VERSION=0.14.0.5
+ VERSION=0.14.0.7
SOURCE="dataenc-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/dataenc/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:b73e5060a3b9c00fbcdadb6dd8ca890c4a6f8ef862822e7d71bde1c0a99de1199cfa384cd8c219f41218f8eef4e9017ecc2c1c186516d7a809aadb599530bf88
+
SOURCE_HASH=sha512:82f34ad51b64b66726e45c0c2ef52c9c2be201f42c5718763158a13eb2e8f82cb0298c1580dd52788e8d7b3f1eb0e7ade4e6e69f7ba4b2f8804eb2178e719e20
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/dataenc-${VERSION}"
WEB_SITE="http://www.haskell.org/haskellwiki/Library/Data_encoding";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-dataenc/HISTORY b/haskell/haskell-dataenc/HISTORY
index cd05d20..a9d0865 100644
--- a/haskell/haskell-dataenc/HISTORY
+++ b/haskell/haskell-dataenc/HISTORY
@@ -1,3 +1,6 @@
+2014-04-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.14.0.7
+
2013-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/haskell/haskell-mtl/DETAILS b/haskell/haskell-mtl/DETAILS
index 85b7be6..898513d 100755
--- a/haskell/haskell-mtl/DETAILS
+++ b/haskell/haskell-mtl/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-mtl
- VERSION=2.1.2
+ VERSION=2.1.3.1
SOURCE="mtl-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/mtl/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:ef8043adeb2746c770bebd4683c95c399bdc047c278b619d89230f342d13c33f0a9275c6be399e6da329f385ff209ff537e002b82d5075684202e8703fc5e29d
+
SOURCE_HASH=sha512:dbb388eda920ba23525f89f1be840f23e7afdf8a0efdbee9a2efd03eb0c9fd64e0788e186236bbdcc6203c9fc02a3512a63ad4dc82946f6e9364bdb1a94e5f62
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/mtl-${VERSION}"

WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/mtl";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-mtl/HISTORY b/haskell/haskell-mtl/HISTORY
index 18763f1..210ef8a 100644
--- a/haskell/haskell-mtl/HISTORY
+++ b/haskell/haskell-mtl/HISTORY
@@ -1,3 +1,6 @@
+2014-04-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.1.3.1
+
2012-09-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.1.2

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 430f12e..ba5c51d 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -1,6 +1,6 @@
depends -sub CXX gcc &&
depends nspr '--with-system-nspr' &&
-depends -sub "3.15.x" nss '--with-system-nss' &&
+depends -sub "3.16.x" nss '--with-system-nss' &&
depends zlib '--with-system-zlib' &&
depends libjpeg-turbo '--with-system-jpeg' &&
depends libidl &&
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 9b76ba8..ea2a77c 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,7 +1,7 @@
SPELL=firefox
- VERSION=28.0
+ VERSION=29.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:9334b45d8b56829e7061b87c377aae80e48060e127dfc3eb6a6996590dd92268bd0273203094cdf9aa22fda8128ab9ed1e5fd6fee3e93a430359c0a0631090f7
+
SOURCE_HASH=sha512:5f40d2862f53ab3551cc2da433c4535027191a808431b8fefd6e87095e33d5539bf633bda25d270af26c32330dd211b003b389aa07f87aa7b97e82b529de78f1

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
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 2c0762b..4d9775f 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2014-04-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 29.0
+ * DEPENDS: depend on nss 3.16
+ * install_dir.patch: renewed
+
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
diff --git a/http/firefox/install_dir.patch b/http/firefox/install_dir.patch
index 27341b8..df0e7f8 100644
--- a/http/firefox/install_dir.patch
+++ b/http/firefox/install_dir.patch
@@ -1,18 +1,20 @@
-From 7813eacdf8383d21f384a908ee6ed46a4e7ef1c9 Mon Sep 17 00:00:00 2001
+From f08c2e802224e5824b6f251553aa46c9c23dbcfc Mon Sep 17 00:00:00 2001
From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Thu, 12 Dec 2013 17:50:02 +0100
-Subject: [PATCH] omit version number from installation path
+Date: Mon, 28 Apr 2014 22:34:23 +0200
+Subject: [PATCH] fix install path

---
- config/baseconfig.mk | 8 ++++----
- js/src/config/baseconfig.mk | 4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ config/baseconfig.mk | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/baseconfig.mk b/config/baseconfig.mk
-index 50f4cd4..1e7c1f2 100644
+index b4723a9..8417918 100644
--- a/config/baseconfig.mk
+++ b/config/baseconfig.mk
-@@ -1,7 +1,7 @@
+@@ -2,10 +2,10 @@
+ # directly in python/mozbuild/mozbuild/base.py for gmake validation.
+ # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
+ # whether a normal build is happening or whether the check is running.
-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
@@ -21,21 +23,9 @@ index 50f4cd4..1e7c1f2 100644
+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
+installdir = $(libdir)/$(MOZ_APP_NAME)
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- DIST = $(DEPTH)/dist
-
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff --git a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk
-index 1ff076c..5386569 100644
---- a/js/src/config/baseconfig.mk
-+++ b/js/src/config/baseconfig.mk
-@@ -1,5 +1,5 @@
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
-
- ifneq (,$(filter /%,$(TOP_DIST)))
- DIST = $(TOP_DIST)
+ ifndef TOP_DIST
+ TOP_DIST = dist
+ endif
--
-1.8.4.2
+1.9.1

diff --git a/libs/gflags/DETAILS b/libs/gflags/DETAILS
index 673766f..0510998 100755
--- a/libs/gflags/DETAILS
+++ b/libs/gflags/DETAILS
@@ -1,8 +1,8 @@
SPELL=gflags
VERSION=2.1.1
- SOURCE="${SPELL}-${VERSION}.tar.xz"
- SOURCE_URL[0]=http://www.hawo.net/~siflfran/smgl/${SOURCE}
-
SOURCE_HASH=sha512:65d7ef1c2d937705b6404e883fd0820ae5fadfc6f7bbb42fd1299bfede058f896dd24e431bfc9581706bd8176834f2e93b74f63afa9c9226f9c27fa15e2bed20
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=https://github.com/schuhschuh/gflags/archive/v${VERSION}.tar.gz
+
SOURCE_HASH=sha512:18d1a0a1271f12f0e87447e3a9d6810f531f5b190d84274465add5a928c189caac911ec2592422895961ab3c0c7566ff50c0c22f71d185ac3413c54bdbfb00ef
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://code.google.com/p/gflags/
LICENSE[0]=BSD
diff --git a/libs/gflags/HISTORY b/libs/gflags/HISTORY
index 1619f57..3cb92b3 100644
--- a/libs/gflags/HISTORY
+++ b/libs/gflags/HISTORY
@@ -1,3 +1,6 @@
+2014-04-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: change SOURCE_URL[0] to github
+
2014-04-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.1.1
* DEPENDS, BUILD: use cmake



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (6c96c4bde847dc43799a44645a98794b9320682d), Florian Franzmann, 04/28/2014

Archive powered by MHonArc 2.6.24.

Top of Page