Skip to Content.
Sympa Menu

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

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 (6307b1a61aef90806723d3ef7e96f6c398354b21)
  • Date: Fri, 7 Mar 2008 12:50:20 -0600

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

gnome2-apps/gnome-alsamixer/BUILD | 2 +
gnome2-apps/gnome-alsamixer/HISTORY | 4 ++
gnome2-apps/gnome-alsamixer/PRE_BUILD | 3 +
gnome2-apps/gnome-alsamixer/gnome-alsamixer.patch | 36
++++++++++++++++++++++
libs/stlport/BUILD | 4 +-
libs/stlport/HISTORY | 4 ++
printer/ghostscript/BUILD | 4 +-
printer/ghostscript/HISTORY | 3 +
8 files changed, 58 insertions(+), 2 deletions(-)

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

gnome2-apps/gnome-alsamixer: fixed a compile error

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

printer/ghostscript: added make_single/make_normal to BUILD

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

libs/stlport: added make_single to BUILD

diff --git a/gnome2-apps/gnome-alsamixer/BUILD
b/gnome2-apps/gnome-alsamixer/BUILD
new file mode 100755
index 0000000..5605674
--- /dev/null
+++ b/gnome2-apps/gnome-alsamixer/BUILD
@@ -0,0 +1,2 @@
+CFLAGS="${CFLAGS} -UG_DISABLE_DEPRECATED -UGDK_DISABLE_DEPRECATED
-UGTK_DISABLE_DEPRECATED -UGNOME_DISABLE_DEPRECATED"
+default_build
diff --git a/gnome2-apps/gnome-alsamixer/HISTORY
b/gnome2-apps/gnome-alsamixer/HISTORY
index 583291a..8113dff 100644
--- a/gnome2-apps/gnome-alsamixer/HISTORY
+++ b/gnome2-apps/gnome-alsamixer/HISTORY
@@ -1,3 +1,7 @@
+2008-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, PRE_BUILD, gnome-alsamixer.patch: added a patch from
+ debian to fix a compile error
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed MAINTAINER.

diff --git a/gnome2-apps/gnome-alsamixer/PRE_BUILD
b/gnome2-apps/gnome-alsamixer/PRE_BUILD
new file mode 100755
index 0000000..b3305a4
--- /dev/null
+++ b/gnome2-apps/gnome-alsamixer/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/gnome-alsamixer.patch
diff --git a/gnome2-apps/gnome-alsamixer/gnome-alsamixer.patch
b/gnome2-apps/gnome-alsamixer/gnome-alsamixer.patch
new file mode 100644
index 0000000..47016ce
--- /dev/null
+++ b/gnome2-apps/gnome-alsamixer/gnome-alsamixer.patch
@@ -0,0 +1,36 @@
+diff -ruN gnome-alsamixer-0.9.6/src/gam-app.c
gnome-alsamixer-0.9.6.new/src/gam-app.c
+--- gnome-alsamixer-0.9.6/src/gam-app.c 2003-09-09 13:41:23.000000000
+0200
++++ gnome-alsamixer-0.9.6.new/src/gam-app.c 2005-08-31 15:34:42.000000000
+0200
+@@ -25,7 +25,7 @@
+ #include <gtk/gtklabel.h>
+ #include <gtk/gtknotebook.h>
+ #include <gtk/gtkmenuitem.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-config.h>
+ #include <libgnomeui/gnome-about.h>
+ #include <libgnomeui/gnome-app-helper.h>
+diff -ruN gnome-alsamixer-0.9.6/src/gam-prefs-dlg.c
gnome-alsamixer-0.9.6.new/src/gam-prefs-dlg.c
+--- gnome-alsamixer-0.9.6/src/gam-prefs-dlg.c 2003-09-09 13:37:23.000000000
+0200
++++ gnome-alsamixer-0.9.6.new/src/gam-prefs-dlg.c 2005-08-31
15:35:45.000000000 +0200
+@@ -22,7 +22,7 @@
+ #include <config.h>
+ #endif
+
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-config.h>
+
+ #include "gam-prefs-dlg.h"
+diff -ruN gnome-alsamixer-0.9.6/src/gam-props-dlg.c
gnome-alsamixer-0.9.6.new/src/gam-props-dlg.c
+--- gnome-alsamixer-0.9.6/src/gam-props-dlg.c 2003-09-09 13:31:18.000000000
+0200
++++ gnome-alsamixer-0.9.6.new/src/gam-props-dlg.c 2005-08-31
15:35:52.000000000 +0200
+@@ -22,7 +22,7 @@
+ #include <config.h>
+ #endif
+
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+
+ #include "gam-props-dlg.h"
+ #include "gam-slider.h"
diff --git a/libs/stlport/BUILD b/libs/stlport/BUILD
index bc3cf2d..8eecbcc 100755
--- a/libs/stlport/BUILD
+++ b/libs/stlport/BUILD
@@ -9,4 +9,6 @@ sedit "s:../g++-v3:/usr/include/c++/`installed_version
gcc`:g" \
cd build/lib &&
cp gcc.mak Makefile &&
sedit 's:\-O2:${CFLAGS}:' Makefile &&
-make clean depend install
+make_single &&
+make clean depend install &&
+make_normal
diff --git a/libs/stlport/HISTORY b/libs/stlport/HISTORY
index f9a3a9e..98e945b 100644
--- a/libs/stlport/HISTORY
+++ b/libs/stlport/HISTORY
@@ -1,3 +1,7 @@
+2008-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: added make_single since the build process doesn't work
+ if the number of jobs is >1
+
2008-01-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.1.5

diff --git a/printer/ghostscript/BUILD b/printer/ghostscript/BUILD
index 260163b..481abe6 100755
--- a/printer/ghostscript/BUILD
+++ b/printer/ghostscript/BUILD
@@ -2,8 +2,10 @@
OPTS="--with-drivers=`echo ${GS_PRINTERS} |sed "s/^ *//;s/ /,/g"`,FILES \
--enable-dynamic ${GS_OMNI} ${OPTS}" &&

+make_single &&
default_build &&

if [[ $GS_LIBGS == y ]]; then
make so
-fi
+fi &&
+make_normal
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index 3dc808a..0b585fe 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,6 @@
+2008-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: added make_single, make_normal
+
2008-03-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 8.62, fixed desc




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (6307b1a61aef90806723d3ef7e96f6c398354b21), Florian Franzmann, 03/07/2008

Archive powered by MHonArc 2.6.24.

Top of Page