Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev (879916ce5631139c9ab637d56ac221bf161880a1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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.61 grimoire by Vlad Glagolev (879916ce5631139c9ab637d56ac221bf161880a1)
  • Date: Sun, 13 May 2012 07:59:51 -0500

GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

disk/udev/DEPENDS | 2 -
disk/udev/HISTORY | 1
editors/elvis/BUILD | 5 ++++
editors/elvis/DEPENDS | 12 +++++++++
editors/elvis/DETAILS | 3 --
editors/elvis/HISTORY | 9 +++++++
editors/elvis/PRE_BUILD | 8 ++++--
editors/elvis/badmatch.patch | 34
++++++++++++++++++++++++++++
editors/elvis/freetype.patch | 12 +++++++++
libs/gettext/BUILD | 3 ++
libs/gettext/DETAILS | 1
libs/gettext/HISTORY | 5 ++++
smgl/sorcery-pubkeys/DETAILS | 2 -
smgl/sorcery-pubkeys/HISTORY | 4 +++
smgl/sorcery-pubkeys/grimoire-stable-rc.gpg |binary
utils/metalog/DEPENDS | 1
utils/metalog/HISTORY | 3 ++
17 files changed, 94 insertions(+), 11 deletions(-)

New commits:
commit 879916ce5631139c9ab637d56ac221bf161880a1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

elvis: pre-release update

commit 2243809aacd1fbc6673af3c0278e88a833270e28
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "udev: fixed #357 (missing glib2 dep)"

This reverts commit 392623190e2aa19f871d0d91d90f170264892b19.

while we have --disable-gudev flag, it's auto-fixed and glib2 is left as
optional.
(cherry picked from commit e8051b74555c99f8acbe53fecd72ac9f2f73d41a)

commit 0ac7ab1df6a91cff0bf4433333fd4e31aba299fb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gettext: corrected typo
(cherry picked from commit 855205c7c652dc7faffe0746666611d3d8883636)

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

gettext: added forgotten HISTORY entry
(cherry picked from commit 470ade75c9ca0fe4de1eccd2296a71844646e663)

commit 67d54274604a3b520c373015e72f7f5df396eae5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gettext: force included version of glib2
(cherry picked from commit 5d872502d88e0099dc7f590bb2078221673418d5)

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

metalog: removed p7zip
(cherry picked from commit e41964831095f6dc016d7ba84d1edd5c08f43051)

commit 4691c1865777fdce56c230c3bfe5f383449b88d9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sorcery-pubkeys: => 1.6.6
(cherry picked from commit 568e15150cc1f3b7dc8f667172a7c32d2faebf3b)

diff --git a/disk/udev/DEPENDS b/disk/udev/DEPENDS
index 371eb17..5fff845 100755
--- a/disk/udev/DEPENDS
+++ b/disk/udev/DEPENDS
@@ -2,8 +2,6 @@ depends gnupg &&
depends smgl-fhs &&
depends gperf &&
depends pkgconfig &&
-depends glib2 &&
-
if [[ "${UDEV_HWDB}" == '--enable-hwdb' ]]; then
depends USBIDS &&
depends PCIIDS
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index f4ca1e6..4c15a69 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,6 +1,5 @@
2012-02-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: renewed source url; temporary switch to sha512sum
- * DEPENDS: added missing req glib2 dependency (fixes #357)
* kay.gpg: removed jpeg photo

2011-12-20 David Kowis <dkowis AT shlrm.org>
diff --git a/editors/elvis/BUILD b/editors/elvis/BUILD
index 0a62317..80b877a 100755
--- a/editors/elvis/BUILD
+++ b/editors/elvis/BUILD
@@ -1,5 +1,10 @@
+OPTS="--verbose $OPTS" &&
+
sedit "s/-O2/$CFLAGS/" configure &&
+# corrected manuals installation
sedit "s:\/usr\/local:${INSTALL_ROOT}\/usr:" instman.sh &&
+sedit "s:${PREFIX}\/man:${PREFIX}\/share\/man:" instman.sh &&
+
OPT=`echo "${OPTS} linux"` &&
default_build

diff --git a/editors/elvis/DEPENDS b/editors/elvis/DEPENDS
index b9dca8e..7dc2945 100755
--- a/editors/elvis/DEPENDS
+++ b/editors/elvis/DEPENDS
@@ -1 +1,11 @@
-optional_depends "xorg-libs" "--with-x" "--with-x=no " "For a GUI editor"
+depends ncurses &&
+
+optional_depends libx11 \
+ "--with-x" \
+ "--without-x" \
+ "for a GUI editor" &&
+
+if is_depends_enabled $SPELL libx11; then
+ depends expat &&
+ depends libxft
+fi
diff --git a/editors/elvis/DETAILS b/editors/elvis/DETAILS
index d83a395..2d46cf9 100755
--- a/editors/elvis/DETAILS
+++ b/editors/elvis/DETAILS
@@ -1,13 +1,12 @@
SPELL=elvis
VERSION=2.2_0
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.cs.pdx.edu/pub/$SPELL/$SOURCE

SOURCE_HASH=sha512:847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42
WEB_SITE=http://elvis.the-little-red-haired-girl.org/
LICENSE[0]=GPL
ENTERED=20010922
- UPDATED=20031120
MENU_ITEM[0]=${SPELL}
MENU_EXEC[0]=${SPELL}
MENU_DESC[0]=${SHORT}
diff --git a/editors/elvis/HISTORY b/editors/elvis/HISTORY
index 88ad039..9917787 100644
--- a/editors/elvis/HISTORY
+++ b/editors/elvis/HISTORY
@@ -1,3 +1,12 @@
+2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: removed UPDATED; quoting paths
+ * DEPENDS: killed xorg-libs, see #14699 on old bug tracker; added
+ missing deps
+ * BUILD: verbosity++; corrected manuals installation
+ * PRE_BUILD: apply the patches
+ * badmatch.patch: added, official patch to ignore innocent X11 errors
+ * freetype.patch: added, to fix conflict with FreeType
+
2009-07-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: updated WEB_SITE

diff --git a/editors/elvis/PRE_BUILD b/editors/elvis/PRE_BUILD
index 75cb1c8..e185eef 100755
--- a/editors/elvis/PRE_BUILD
+++ b/editors/elvis/PRE_BUILD
@@ -1,4 +1,6 @@
-default_pre_build &&
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&

-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/elvis-glibc.patch
+patch -p0 < "$SPELL_DIRECTORY/freetype.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/badmatch.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/elvis-glibc.patch"
diff --git a/editors/elvis/badmatch.patch b/editors/elvis/badmatch.patch
new file mode 100644
index 0000000..d4cfb28
--- /dev/null
+++ b/editors/elvis/badmatch.patch
@@ -0,0 +1,34 @@
+--- guix11/guix11.c.orig 2003-10-21 06:32:26.000000000 +0400
++++ guix11/guix11.c 2004-03-27 01:35:32.000000000 +0400
+@@ -80,6 +80,7 @@
+ #if USE_PROTOTYPES
+ static void beep(GUIWIN *gw);
+ static int catchErrors(Display *disp, XErrorEvent *err);
++static int ignoreErrors(Display *disp, XErrorEvent *err);
+ static void moveto(GUIWIN *gw, int column, int row);
+ static ELVBOOL scroll(GUIWIN *gw, int qty, ELVBOOL notlast);
+ static ELVBOOL shift(GUIWIN *gw, int qty, int rows);
+@@ -771,7 +768,6 @@
+ }
+
+
+-#if 0
+ /* dummy X11 error handler */
+ static int ignoreErrors(disp, err)
+ Display *disp;
+@@ -779,7 +775,6 @@
+ {
+ return 0;
+ }
+-#endif
+
+
+ /* Test whether this GUI is available in this environment.
+@@ -1719,6 +1720,7 @@
+ guicmd(NULL, "newtoolbar");
+
+ /* warp the cursor back to the original (non-Elvis) window */
++ XSetErrorHandler(ignoreErrors);
+ if (o_warpback && fromwin != root)
+ {
+ XGetInputFocus(x_display, &curfocus, &dummy);
diff --git a/editors/elvis/freetype.patch b/editors/elvis/freetype.patch
new file mode 100644
index 0000000..2e0eea7
--- /dev/null
+++ b/editors/elvis/freetype.patch
@@ -0,0 +1,12 @@
+--- guix11/xdialog.h.orig 2006-06-26 12:17:12.000000000 +0200
++++ guix11/xdialog.h 2006-06-26 12:19:24.000000000 +0200
+@@ -1,5 +1,9 @@
+ /* xdialog.h */
+
++/* Let's hope that there will be no conflict with FreeType,
++ * which had defined this to FILE. */
++#undef FT_FILE
++
+ typedef enum {
+ FT_DEFAULT, /* dummy value, for fields with no explicit type */
+ FT_ONEOF, /* one of a preset list; includes boolean */
diff --git a/libs/gettext/BUILD b/libs/gettext/BUILD
index d840830..fcdbecd 100755
--- a/libs/gettext/BUILD
+++ b/libs/gettext/BUILD
@@ -3,6 +3,9 @@ export CC=gcc &&
# pth support is semi-broken, so force POSIX threads
OPTS="--enable-threads=posix $OPTS" &&

+# never rely on external glib2
+OPTS="--with-included-glib $OPTS" &&
+
make_single &&

./configure --build=$BUILD \
diff --git a/libs/gettext/DETAILS b/libs/gettext/DETAILS
index 2682c49..4a8bee0 100755
--- a/libs/gettext/DETAILS
+++ b/libs/gettext/DETAILS
@@ -1,5 +1,6 @@
SPELL=gettext
VERSION=0.18.1.1
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/gettext/HISTORY b/libs/gettext/HISTORY
index e7e68c6..0d7e38e 100644
--- a/libs/gettext/HISTORY
+++ b/libs/gettext/HISTORY
@@ -1,3 +1,8 @@
+2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * BUILD: force internal glib2, so basesystem can be glib2-free, which
+ depends on python
+
2012-02-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: made the dependency on libcroco optional

diff --git a/smgl/sorcery-pubkeys/DETAILS b/smgl/sorcery-pubkeys/DETAILS
index 48bf1ff..1eb1b1a 100755
--- a/smgl/sorcery-pubkeys/DETAILS
+++ b/smgl/sorcery-pubkeys/DETAILS
@@ -1,5 +1,5 @@
SPELL=sorcery-pubkeys
- VERSION=1.6.5
+ VERSION=1.6.6
LICENSE=GPL
WEB_SITE=http://www.sourcemage.org/
GATHER_DOCS=off
diff --git a/smgl/sorcery-pubkeys/HISTORY b/smgl/sorcery-pubkeys/HISTORY
index 303c774..9b3e2a8 100644
--- a/smgl/sorcery-pubkeys/HISTORY
+++ b/smgl/sorcery-pubkeys/HISTORY
@@ -1,3 +1,7 @@
+2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: version 1.6.6
+ * grimoire-stable-rc.gpg: added my key
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/smgl/sorcery-pubkeys/grimoire-stable-rc.gpg
b/smgl/sorcery-pubkeys/grimoire-stable-rc.gpg
index 5b8b952..fb89193 100644
Binary files a/smgl/sorcery-pubkeys/grimoire-stable-rc.gpg and
b/smgl/sorcery-pubkeys/grimoire-stable-rc.gpg differ
diff --git a/utils/metalog/DEPENDS b/utils/metalog/DEPENDS
index 26f027b..c0c7081 100755
--- a/utils/metalog/DEPENDS
+++ b/utils/metalog/DEPENDS
@@ -1,4 +1,3 @@
-depends p7zip &&
depends gnupg &&
depends pcre &&
depends xz-utils
diff --git a/utils/metalog/HISTORY b/utils/metalog/HISTORY
index 819072c..fc8a0cb 100644
--- a/utils/metalog/HISTORY
+++ b/utils/metalog/HISTORY
@@ -1,3 +1,6 @@
+2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: dropped p7zip -- no longer needed
+
2011-12-02 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing dependency
* PRE_BUILD: added, to make it work with stable sorcery (otherwise
it's



  • [SM-Commit] GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev (879916ce5631139c9ab637d56ac221bf161880a1), Vlad Glagolev, 05/13/2012

Archive powered by MHonArc 2.6.24.

Top of Page