Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (548cef21fdd379b24047283af5f928f42ae1748b)

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 master grimoire by Vlad Glagolev (548cef21fdd379b24047283af5f928f42ae1748b)
  • Date: Sun, 13 May 2012 08:00:57 -0500

GIT changes to master 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 ++++++++++++
9 files changed, 77 insertions(+), 9 deletions(-)

New commits:
commit 548cef21fdd379b24047283af5f928f42ae1748b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

elvis: pre-release update
(cherry picked from commit 879916ce5631139c9ab637d56ac221bf161880a1)

commit e8051b74555c99f8acbe53fecd72ac9f2f73d41a
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.

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 */



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (548cef21fdd379b24047283af5f928f42ae1748b), Vlad Glagolev, 05/13/2012

Archive powered by MHonArc 2.6.24.

Top of Page