Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (6019c1cfd0aef06c5a6ea1f6ff43fec2b702d7f3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (6019c1cfd0aef06c5a6ea1f6ff43fec2b702d7f3)
  • Date: Thu, 14 Apr 2011 06:50:26 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

gnome2-apps/abiword/DEPENDS | 2 +-
gnome2-apps/abiword/HISTORY | 3 +++
wm-addons/wmdrawer/BUILD | 1 -
wm-addons/wmdrawer/DEPENDS | 3 ++-
wm-addons/wmdrawer/DETAILS | 4 ++--
wm-addons/wmdrawer/HISTORY | 7 +++++++
wm-addons/wmdrawer/PRE_BUILD | 3 +++
wm-addons/wmdrawer/wmdrawer.patch | 31 +++++++++++++++++++++++++++++++
x11-libs/fontconfig/DEPENDS | 3 ++-
x11-libs/fontconfig/HISTORY | 4 ++++
x11-libs/fontconfig/PRE_SUB_DEPENDS | 4 ++++
x11-libs/fontconfig/SUB_DEPENDS | 6 ++++++
12 files changed, 65 insertions(+), 6 deletions(-)

New commits:
commit 71980f2e9206464c1d5084e96823bfb17b93ddd0
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

wmdrawer: added Makefile patch for install and library locations,
added missing dep on libxext, corrected hashsum, switched to gdk-pixbuf2
fixed bug #14818

commit a0d228878a80e99a2f9378a2a6e89b6d661a5c75
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

abiword: added a subdependency on a default font, fixes bug #11713

commit b2e1990a46dc7e60e49e64fb790a08f6cf5230b3
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

fontconfig: added optional/sub-dependable default font. fixes bug #11713

diff --git a/gnome2-apps/abiword/DEPENDS b/gnome2-apps/abiword/DEPENDS
index aa4a6fc..204071b 100755
--- a/gnome2-apps/abiword/DEPENDS
+++ b/gnome2-apps/abiword/DEPENDS
@@ -8,7 +8,7 @@ depends freetype2 &&
depends libgsf &&
depends wv &&
depends libxml2 &&
-depends fontconfig &&
+depends -sub FONT fontconfig &&
depends librsvg2 &&

if list_find "$ABIWORD_OPTS" "--enable-plugins"; then
diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index 6d1c3b5..cd3a0d6 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,6 @@
+2011-04-14 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added a subdependency on a font to fontconfig
+
2011-04-10 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: added some of the missing deps for collab and plugins.

diff --git a/wm-addons/wmdrawer/BUILD b/wm-addons/wmdrawer/BUILD
index 319d781..8f58e6d 100755
--- a/wm-addons/wmdrawer/BUILD
+++ b/wm-addons/wmdrawer/BUILD
@@ -1,2 +1 @@
-sed -i "s/\usr\/local/${INSTALL_ROOT}\/usr/g" Makefile &&
make
diff --git a/wm-addons/wmdrawer/DEPENDS b/wm-addons/wmdrawer/DEPENDS
index 694ecbb..3e81329 100755
--- a/wm-addons/wmdrawer/DEPENDS
+++ b/wm-addons/wmdrawer/DEPENDS
@@ -1 +1,2 @@
-depends gdk-pixbuf
+depends gdk-pixbuf2 &&
+depends libxext
diff --git a/wm-addons/wmdrawer/DETAILS b/wm-addons/wmdrawer/DETAILS
index 0e8770a..2fcf883 100755
--- a/wm-addons/wmdrawer/DETAILS
+++ b/wm-addons/wmdrawer/DETAILS
@@ -2,12 +2,12 @@
VERSION=0.10.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_HASH=sha512:6df90cf91fcfd0d437db5fb57440021afb28a5c29764942a665b7d9fa1a97c7e8e10fbfd68c60055ff73f24e1bcefdf0972e2f3b6f2e602e1f05376f9d490dfb
SOURCE_URL[0]=http://people.easter-eggs.org/~valos/wmdrawer/$SOURCE
WEB_SITE=http://people.easter-eggs.org/~valos/wmdrawer/
ENTERED=20030715
LICENSE[0]=GPL
-
SOURCE_HASH=sha256:1fd727ce9d91abe1e0c12ad82dbaa9b3aa69f4b852af460ac81c32a7394c5078

-
SOURCE_HASH=sha512:f1e7cb7dc16841a7176e628f42ba5834200707dc162838e62fc7233e383d0aab6ce7fe22017286d26ce6ddc2e3cb6f1d0d21acd176fd36a0cdcd7ab04a2dbae1

+ GATHER_DOCS=off
KEYWORDS="windowmaker wm-addons"
SHORT="WindowMaker dockapp to launch applications"
cat << EOF
diff --git a/wm-addons/wmdrawer/HISTORY b/wm-addons/wmdrawer/HISTORY
index 6c37d61..b1c1ace 100644
--- a/wm-addons/wmdrawer/HISTORY
+++ b/wm-addons/wmdrawer/HISTORY
@@ -1,3 +1,10 @@
+2011-04-14 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: corrected sha512, removed sha256, switched GATHER_DOCS off
as
+ make install already installs the needed files and sorcery just
adds crap
+ * PRE_BUILD, DEPENDS: switched to gdk-pixbuf2 and added dep on libxext
+ * BUILD, PRE_BUILD: moved all Makefile changes into a patch
+ * wmdrawer.patch: added
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/wm-addons/wmdrawer/PRE_BUILD b/wm-addons/wmdrawer/PRE_BUILD
new file mode 100755
index 0000000..e24fed2
--- /dev/null
+++ b/wm-addons/wmdrawer/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+patch -p0 < "${SCRIPT_DIRECTORY}/wmdrawer.patch"
diff --git a/wm-addons/wmdrawer/wmdrawer.patch
b/wm-addons/wmdrawer/wmdrawer.patch
new file mode 100644
index 0000000..2a117ce
--- /dev/null
+++ b/wm-addons/wmdrawer/wmdrawer.patch
@@ -0,0 +1,31 @@
+--- Makefile 2004-06-26 20:16:04.000000000 +0200
++++ Makefile-fixed 2011-04-14 13:19:22.996849506 +0200
+@@ -11,13 +11,13 @@
+
+ DESTDIR =
+
+-PREFIX = $(DESTDIR)/usr/local
+-MANDIR = $(PREFIX)/man/man1
++PREFIX = $(DESTDIR)/usr
++MANDIR = $(PREFIX)/share/man/man1
+ DOCDIR = $(PREFIX)/share/doc
+
+ # Image library
+-USE_GDKPIXBUF = 1
+-#USE_GDKPIXBUF2 = 1
++#USE_GDKPIXBUF = 1
++USE_GDKPIXBUF2 = 1
+ #USE_IMLIB = 1
+
+ DEFS = $(OS)
+@@ -30,8 +30,8 @@
+
+ ifdef USE_GDKPIXBUF2
+ IMGLIB_DEF = -DUSE_GDKPIXBUF2
+-CFLAGS = -O3 -Wall `pkg-config --cflags gdk-pixbuf-xlib-2.0`
-I/usr/X11R6/include
+-LDFLAGS = `pkg-config --libs gdk-pixbuf-xlib-2.0` -rdynamic -lX11 -lXi
-lXext -L/usr/X11R6/lib
++CFLAGS = -O3 -Wall `pkg-config --cflags gdk-pixbuf-xlib-2.0`
-I/usr/include/X11
++LDFLAGS = `pkg-config --libs gdk-pixbuf-xlib-2.0` -rdynamic -lX11 -lXi
-lXext -L/usr/lib
+ endif
+
+ ifdef USE_IMLIB
diff --git a/x11-libs/fontconfig/DEPENDS b/x11-libs/fontconfig/DEPENDS
index ee12e3b..01deb2c 100755
--- a/x11-libs/fontconfig/DEPENDS
+++ b/x11-libs/fontconfig/DEPENDS
@@ -11,4 +11,5 @@ optional_depends docbook-utils \

if is_depends_enabled $SPELL docbook-utils; then
depends HTML_TO_TEXT
-fi
+fi &&
+optional_depends ttf-bitstream-vera '' '' 'for a default font'
diff --git a/x11-libs/fontconfig/HISTORY b/x11-libs/fontconfig/HISTORY
index d3cbda3..895f4e3 100644
--- a/x11-libs/fontconfig/HISTORY
+++ b/x11-libs/fontconfig/HISTORY
@@ -1,3 +1,7 @@
+2011-04-14 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS, SUB_DEPENDS, PRE_SUB_DEPENDS: added bitstream-vera as
+ optional default font (fixes bug #11713)
+
2009-12-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.8.0

diff --git a/x11-libs/fontconfig/PRE_SUB_DEPENDS
b/x11-libs/fontconfig/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..9c05b03
--- /dev/null
+++ b/x11-libs/fontconfig/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ FONT) is_depends_enabled $SPELL ttf-bitstream-vera && return 0;;
+esac
+return 1
diff --git a/x11-libs/fontconfig/SUB_DEPENDS b/x11-libs/fontconfig/SUB_DEPENDS
new file mode 100755
index 0000000..127563d
--- /dev/null
+++ b/x11-libs/fontconfig/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+FONT) echo "Default font requested, forcing bitstream vera." &&
+ depends ttf-bitstream-vera
+ ;;
+ *) echo "unknown sub-depends!"; return 1;;
+esac



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (6019c1cfd0aef06c5a6ea1f6ff43fec2b702d7f3), Arjan Bouter, 04/14/2011

Archive powered by MHonArc 2.6.24.

Top of Page