Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.62 grimoire by Vlad Glagolev (0114f5e3395b7bd19f2bd92bfbb4c1251a0fd858)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to stable-rc-0.62 grimoire by Vlad Glagolev (0114f5e3395b7bd19f2bd92bfbb4c1251a0fd858)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.62 grimoire by Vlad Glagolev (0114f5e3395b7bd19f2bd92bfbb4c1251a0fd858)
  • Date: Mon, 23 Feb 2015 03:11:03 -0600
GIT changes to stable-rc-0.62 grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

crypto/gtk-led-askpass/BUILD | 1 +
crypto/gtk-led-askpass/DETAILS | 13 ++++++-------
crypto/gtk-led-askpass/HISTORY | 6 ------
crypto/gtk-led-askpass/PRE_BUILD | 5 +++--
disk/btrfs-progs/BUILD | 6 +++++-
disk/btrfs-progs/DEPENDS | 19 +++++++++++++++----
disk/btrfs-progs/DETAILS | 23 +++++++++++++++--------
disk/btrfs-progs/HISTORY | 10 ++++++++++
disk/btrfs-progs/INSTALL | 6 +++++-
disk/btrfs-progs/PREPARE | 2 +-
disk/btrfs-progs/PRE_BUILD | 6 ++++++
http/firefox/BUILD | 6 ++++++
http/firefox/HISTORY | 3 +++
13 files changed, 76 insertions(+), 30 deletions(-)

New commits:
commit 0114f5e3395b7bd19f2bd92bfbb4c1251a0fd858
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

btrfs-progs: => 3.18.2
(cherry picked from commit 629339bdb357c243182fb580b436c1909b0df063)

commit 5b0268128dcee5addbc62bca4b57dca9f2f97ebc
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "gtk-led-askpass 0.11"

This reverts commit 60d97df7ad75beb52fd452f262ebd99e46007170.

Usage of devel sorcery is forbidden when working on the grimoire.
Because in comparison with sorcery, grimoire has regular update basis.

Instead this can be done via custom DOWNLOAD file and sorcery version
check if
needed.
(cherry picked from commit f00578691e3ed3f67c6425ee975da348e6b9a47e)

commit a7636c29e1e63e6bd89e372a4027eb2bff0066a3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

http/firefox: remove -s from LDFLAGS
(cherry picked from commit 77fabf78d0c9c77f9cfb08683e649b3c4082e7af)

diff --git a/crypto/gtk-led-askpass/BUILD b/crypto/gtk-led-askpass/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/crypto/gtk-led-askpass/BUILD
@@ -0,0 +1 @@
+make
diff --git a/crypto/gtk-led-askpass/DETAILS b/crypto/gtk-led-askpass/DETAILS
index 222cbbb..e170524 100755
--- a/crypto/gtk-led-askpass/DETAILS
+++ b/crypto/gtk-led-askpass/DETAILS
@@ -1,11 +1,10 @@
SPELL=gtk-led-askpass
- VERSION=0.11
- SOURCE=$SPELL-git.tar.bz2
- SOURCE_URL[0]=git://git.rhydd.org/$SPELL::$SPELL-$VERSION
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
- WEB_SITE="http://git.rhydd.org/?p=$SPELL;a=summary";
+ VERSION=0.10
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=http://rhydd.org/source/gtk-led-aspass/$SOURCE
+
SOURCE_HASH=sha512:4047f301c05c876473a7f554c5b781dcb2b2fe015e1ba81a9679cdac2f9a86eaf86acb07bb3d3dc445f28750da44760d0716a3df8c6772f7626f469d45935588
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION.orig
+ WEB_SITE=http://rhydd.org/wiki/Gtk_LED_Askpass
LICENSE[0]=GPL
ENTERED=20080330
SHORT="GTK+2-based ssh-askpass"
diff --git a/crypto/gtk-led-askpass/HISTORY b/crypto/gtk-led-askpass/HISTORY
index ddb0c5d..99169a5 100644
--- a/crypto/gtk-led-askpass/HISTORY
+++ b/crypto/gtk-led-askpass/HISTORY
@@ -1,9 +1,3 @@
-2014-07-11 Ismael Luceno <ismael AT sourcemage.org>
- * BUILD, DETAILS, INSTALL, PRE_BUILD: updated spell to 0.11
- Source fetched from git repository now.
- Updated website.
- Run autoreconf, since it uses autotools now.
-
2008-05-24 Vlad Glagolev <stealth AT sourcemage.org>
* INSTALL: $INSTALL_ROOT

diff --git a/crypto/gtk-led-askpass/PRE_BUILD
b/crypto/gtk-led-askpass/PRE_BUILD
index cde1ced..3f79ea6 100755
--- a/crypto/gtk-led-askpass/PRE_BUILD
+++ b/crypto/gtk-led-askpass/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-autoreconf -fsi
+cd $SOURCE_DIRECTORY &&
+
+sed -i "s:/local::" Makefile
diff --git a/disk/btrfs-progs/BUILD b/disk/btrfs-progs/BUILD
index 8f58e6d..a9b8577 100755
--- a/disk/btrfs-progs/BUILD
+++ b/disk/btrfs-progs/BUILD
@@ -1 +1,5 @@
-make
+if is_depends_enabled $SPELL xmlto; then
+ make BUILD_VERBOSE=1
+else
+ make BUILD_VERBOSE=1 DISABLE_DOCUMENTATION=1
+fi
diff --git a/disk/btrfs-progs/DEPENDS b/disk/btrfs-progs/DEPENDS
index 575c5ac..21c38f4 100755
--- a/disk/btrfs-progs/DEPENDS
+++ b/disk/btrfs-progs/DEPENDS
@@ -1,4 +1,15 @@
-depends docbook-xsl &&
-depends xmlto &&
-depends acl &&
-depends e2fsprogs
+depends zlib &&
+depends util-linux &&
+depends lzo &&
+
+optional_depends acl "" "" "for btrfs-convert utility" &&
+
+if is_depends_enabled $SPELL acl; then
+ depends e2fsprogs
+fi &&
+
+optional_depends xmlto "" "" "to build documentation" &&
+
+if is_depends_enabled $SPELL xmlto; then
+ depends asciidoc
+fi
diff --git a/disk/btrfs-progs/DETAILS b/disk/btrfs-progs/DETAILS
index 4d15fdb..3f20989 100755
--- a/disk/btrfs-progs/DETAILS
+++ b/disk/btrfs-progs/DETAILS
@@ -1,16 +1,23 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=btrfs-progs
-
SOURCE_URL[0]=git://git.kernel.org/pub/scm/linux/kernel/git/mason/$SPELL.git
-if [ "$BTRFS_PROGS_BRANCH" = scm ]; then
+if [[ "$BTRFS_PROGS_BRANCH" == scm ]]; then
VERSION=$(get_scm_version)
-else
- VERSION=3.14.2
- SOURCE_URL[0]="$SOURCE_URL[0]::v$VERSION"
-fi
- SOURCE=$SPELL-scm.tar.bz2
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+
SOURCE_URL[0]=git://git.kernel.org/pub/scm/linux/kernel/git/mason/${SPELL}.git:${SPELL}-${VERSION}
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-scm
+else
+ VERSION=3.18.2
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+ SOURCE2=${SOURCE}.sig
+ SOURCE_URL[0]=http://sourcemage.ru/mirror/$SOURCE
+ SOURCE_URL[1]=http://download.sourcemage.org/distro/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL}.sig
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
+ SOURCE_GPG=gurus.gpg:$SOURCE2:WORKS_FOR_ME
+ SOURCE2_IGNORE=signature
+fi
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://btrfs.wiki.kernel.org/
ENTERED=20090205
LICENSE[0]=GPL
diff --git a/disk/btrfs-progs/HISTORY b/disk/btrfs-progs/HISTORY
index 26d1bf9..ce57ef8 100644
--- a/disk/btrfs-progs/HISTORY
+++ b/disk/btrfs-progs/HISTORY
@@ -1,3 +1,13 @@
+2015-02-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.18.2, use our own tarball checked out
+ from
git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
+ (tag v3.18.2), signed by me; quoting paths
+ * DEPENDS: rewritten proper dependency tree
+ * PREPARE: use release by default
+ * PRE_BUILD: added, to handle btrfs-convert
+ * BUILD, INSTALL: handle docless installation; /bin -> /sbin;
+ verbosity++
+
2015-01-22 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Depends on xmlto & docbook-xsl for manpages

diff --git a/disk/btrfs-progs/INSTALL b/disk/btrfs-progs/INSTALL
index baa07f4..3593c7d 100755
--- a/disk/btrfs-progs/INSTALL
+++ b/disk/btrfs-progs/INSTALL
@@ -1 +1,5 @@
-make DESTDIR="$INSTALL_ROOT" prefix=/usr bindir=/bin install
+if is_depends_enabled $SPELL xmlto; then
+ make DESTDIR="$INSTALL_ROOT" prefix=/usr bindir=/sbin install
+else
+ make DISABLE_DOCUMENTATION=1 DESTDIR="$INSTALL_ROOT" prefix=/usr
bindir=/sbin install
+fi
diff --git a/disk/btrfs-progs/PREPARE b/disk/btrfs-progs/PREPARE
index 22bb1c5..1abc8d1 100755
--- a/disk/btrfs-progs/PREPARE
+++ b/disk/btrfs-progs/PREPARE
@@ -1,2 +1,2 @@
. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch scm release
+prepare_select_branch release scm
diff --git a/disk/btrfs-progs/PRE_BUILD b/disk/btrfs-progs/PRE_BUILD
new file mode 100755
index 0000000..df25ba6
--- /dev/null
+++ b/disk/btrfs-progs/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if ! is_depends_enabled $SPELL acl; then
+ sedit "s:btrfs-convert::g" Makefile
+fi
diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 29088fb..08066e4 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -20,6 +20,12 @@ CFLAGS="${CFLAGS//-O3/-O2}" &&
CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&

#
+# fix symbol check in build scripts, firefox adds -s to LDFLAGS so we can
+# remove it here without changing anything...
+#
+LDFLAGS="${LDFLAGS//-s/}" &&
+
+#
# Avoid buggy GCC 4.6 AVX code generation, which breaks libxul
#
local gccver=$(gcc -dumpversion) &&
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index e6f7553..325fe1b 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2015-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: remove -s from LDFLAGS to prevent build error
+
2015-01-26 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 35.0.1



  • [SM-Commit] GIT changes to stable-rc-0.62 grimoire by Vlad Glagolev (0114f5e3395b7bd19f2bd92bfbb4c1251a0fd858), Vlad Glagolev, 02/23/2015

Archive powered by MHonArc 2.6.24.

Top of Page