Options are now backwards (--enable is now --disable).
--enable-pthread use pthread instead of fork (default=yes for
MacOS X/MINGW, no for
everything else)
commit c8c6d10af2b6eed0791d788e0168580790e43be3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
sane-backends: Allow user to override OPTS (parameter listed last)
commit 75ed1e736ff93e25ff029d56f9d13ee21f0e6924
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
commit 7b1415ebc5dfbbc4e672af78bf9a62cd78067b8e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
mesademos: Rename mesademo's clear as clear-gl (Bug #15785)
PATCHLEVEL++
Trigger an ncurses build *after* mesademos if mesademos
is providing /usr/bin/clear
This is to avoid ncurses casting and installing the proper
/usr/bin/clear, then mesademos casting and *removing* what it thinks is
its /usr/bin/clear (and installing /usr/bin/clear-gl), and the user now
having no /usr/bin/clear (a `cleanse --fix` would fix this, but we
shouldn't expect our users to do this except when things are really
broken).
commit 09c9e98c6d7e2610c4f3fd14c2241e731f2b1d9e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
mesademos: Disable building egl
Making all in opengl
make[3]: Entering directory `/usr/src/mesa-demos-8.0.1/src/egl/opengl'
CCLD xeglgears
xeglgears.o: In function `.L153':
xeglgears.c:(.text+0x2474): undefined reference to
`glEGLImageTargetTexture2DOES'
collect2: ld returned 1 exit status
make[3]: *** [xeglgears] Error 1
commit 2fed0e143a91003d8864f2b10b058f128e0229eb
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
commit 61a5547d161f978c5c53609e36766bd666a28d93
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
at-spi: Fixed location of at-spi.schemas
While fixing libcanberra for the make 3.82 syntax issues, noticed it
failed when trying to find libcanberra.schemas. Then looked at
at-spi and noticed it was also failing, but the Makefile did not
make this a hard error.
at-spi.schemas is not under data/, fix Makefile.in
commit cc3a46ae646f7354d75155f45a7762f28d88f429
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
at-spi: Missing entry for make.patch
commit f52fba297a75af09e440146d7674434d0f1626b8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
libcanberra: Fix make 3.82 syntax issues
Still fails to install with:
I/O warning : failed to load external entity
"./data/libcanberra.schemas"
Failed to open `./data/libcanberra.schemas': No such file or directory
make[2]: *** [install-data-local] Error 1
make[2]: Leaving directory `/usr/src/libcanberra-0.23'
Fixed with a second modification to make.patch:
$ find /tmp/libcanberra-0.23 -name libcanberra.schemas
/tmp/libcanberra-0.23/libcanberra.schemas
libcanberra.schemas is not under data/
commit 2ad012001ed6ffcaf9f5c41bff3688522d555d98
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
gtk-doc: Prior commit also fixes libgnome-keyring, gnome-utils2, and
probably others
commit 1fbf75f7358a41b5bd12b31244928a0dd05e8d8b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
readline() on closed filehandle NEWFILE at /usr/bin/gtkdoc-fixxref line
470.
Use of uninitialized value in substitution (s///) at
/usr/bin/gtkdoc-fixxref line 473.
Use of uninitialized value in substitution (s///) at
/usr/bin/gtkdoc-fixxref line 474.
Use of uninitialized value in substitution (s///) at
/usr/bin/gtkdoc-fixxref line 478.
Use of uninitialized value in substitution (s///) at
/usr/bin/gtkdoc-fixxref line 479.
Use of uninitialized value in substitution (s///) at
/usr/bin/gtkdoc-fixxref line 480.
Use of uninitialized value in substitution (s///) at
/usr/bin/gtkdoc-fixxref line 481.
Use of uninitialized value in substitution (s///) at
/usr/bin/gtkdoc-fixxref line 482.
Use of uninitialized value in substitution (s///) at
/usr/bin/gtkdoc-fixxref line 483.
Use of uninitialized value in substitution (s///) at
/usr/bin/gtkdoc-fixxref line 484.
Can't delete html/_temp_src.29581.h.html: No such file or directory at
/usr/bin/gtkdoc-fixxref line 489.
commit 82937929f8f0dc76e6b8df0135bf29475d1f1714
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
gnuplot: Disable laTeX tutorials, broken with current texlive 20091107
Transcript written on latex.log.
fmtutil: /root/.texlive2009/texmf-var/web2c/pdftex/latex.fmt installed.
---! /root/.texlive2009/texmf-var/web2c/pdftex/latex.fmt was written by
pdftex
(Fatal format file error; I'm stymied)
make[2]: *** [tutorial.dvi] Error 1
make[2]: Leaving directory `/usr/src/gnuplot-4.2.6/tutorial'
commit c990a5b046f46fbc132e404e74eabdb8a553fe53
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
diff --git a/gnome2-libs/at-spi/HISTORY b/gnome2-libs/at-spi/HISTORY
index 4664d40..00a223d 100644
--- a/gnome2-libs/at-spi/HISTORY
+++ b/gnome2-libs/at-spi/HISTORY
@@ -1,3 +1,10 @@
+2010-10-06 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Fix new make 3.82 syntax
+ Quote paths and provide patch message
+ * INSTALL: Fails with multiple make jobs
+ * make.patch: Added
+ Updated for incorrect location of at-spi.schemas
+
2010-06-13 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.30.1
diff --git a/gnome2-libs/at-spi/INSTALL b/gnome2-libs/at-spi/INSTALL
index 7b17fb6..dfe44aa 100755
--- a/gnome2-libs/at-spi/INSTALL
+++ b/gnome2-libs/at-spi/INSTALL
@@ -1,3 +1,4 @@
+make_single &&
default_install &&
[ -f ${INSTALL_ROOT}/usr/include/at-spi-1.0/libspi/stateset.h ] ||
cp libspi/stateset.h ${INSTALL_ROOT}/usr/include/at-spi-1.0/libspi
diff --git a/gnome2-libs/at-spi/PRE_BUILD b/gnome2-libs/at-spi/PRE_BUILD
new file mode 100755
index 0000000..6c90aa8
--- /dev/null
+++ b/gnome2-libs/at-spi/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+
+message "${MESSAGE_COLOR}Applying make 3.82 syntax patch...${DEFAULT_COLOR}"
&&
+patch "$SOURCE_DIRECTORY"/Makefile.in \
+ "$SPELL_DIRECTORY"/make.patch
diff --git a/gnome2-libs/at-spi/make.patch b/gnome2-libs/at-spi/make.patch
new file mode 100644
index 0000000..ffcb156
--- /dev/null
+++ b/gnome2-libs/at-spi/make.patch
@@ -0,0 +1,20 @@
+diff -Naur at-spi-1.30.1.orig/Makefile.in at-spi-1.30.1/Makefile.in
+--- at-spi-1.30.1.orig/Makefile.in 2010-10-06 16:18:38.192000020 -0700
++++ at-spi-1.30.1/Makefile.in 2010-10-06 16:18:58.011000022 -0700
+@@ -901,11 +901,11 @@
+ @INTLTOOL_SCHEMAS_RULE@
+
+ @GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
+-@GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \
+-@GCONF_SCHEMAS_INSTALL_TRUE@ for p in
$(schemas_DATA) ; do \
+-@GCONF_SCHEMAS_INSTALL_TRUE@
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL)
--makefile-install-rule $(top_builddir)/data/$$p ; \
+-@GCONF_SCHEMAS_INSTALL_TRUE@ done \
+-@GCONF_SCHEMAS_INSTALL_TRUE@ fi
++@GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \
++@GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(schemas_DATA) ; do \
++@GCONF_SCHEMAS_INSTALL_TRUE@
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL)
--makefile-install-rule $(top_builddir)/$$p ; \
++@GCONF_SCHEMAS_INSTALL_TRUE@ done \
++@GCONF_SCHEMAS_INSTALL_TRUE@ fi
+ @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/gnome2-libs/gtk-doc/DETAILS b/gnome2-libs/gtk-doc/DETAILS
index fd55bcc..ce645dd 100755
--- a/gnome2-libs/gtk-doc/DETAILS
+++ b/gnome2-libs/gtk-doc/DETAILS
@@ -6,12 +6,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=GPL
+ PATCHLEVEL=1
WEB_SITE=http://www.gtk.org/gtk-doc/
ENTERED=20020509
KEYWORDS="gnome2 libs"
SHORT="Tools for authors of the GTK+ reference documentation."
cat << EOF
These are tools for authors of the GTK+ reference documentation.
-See the GTK+ Reference Documentation Project home page:
-http://www.gtk.org/rdp
+See the GTK+ Reference Documentation Project home page: http://www.gtk.org/rdp
EOF
diff --git a/gnome2-libs/gtk-doc/HISTORY b/gnome2-libs/gtk-doc/HISTORY
index 908f4e2..37703b2 100644
--- a/gnome2-libs/gtk-doc/HISTORY
+++ b/gnome2-libs/gtk-doc/HISTORY
@@ -1,3 +1,11 @@
+2010-10-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: Apply bug612028.patch
+ Quote paths and provide patch message
+ * bug612028.patch: Fix https://bugzilla.gnome.org/show_bug.cgi?id=612028
+ Fixes eggdbus compilation, even when using '--disable-gtk-doc'
+ Also fixes libgnome-keyring, gnome-utils2, and probably others
+
2010-05-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.15
@@ -16,7 +24,7 @@
2009-09-04 Finn Haedicke <finn_haedicke AT gmx.net>
* DEPENDS: docbook-xsl not optional,
- requires docbook-dtd
+ requires docbook-dtd
2009-09-04 Quentin Rameau <quinq AT sourcemage.org>
* DEPENDS: added dependency on gnome-doc-utils
diff --git a/gnome2-libs/gtk-doc/PRE_BUILD b/gnome2-libs/gtk-doc/PRE_BUILD
new file mode 100755
index 0000000..cbed84e
--- /dev/null
+++ b/gnome2-libs/gtk-doc/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+
+message "${MESSAGE_COLOR}Applying make 3.82 syntax patch...${DEFAULT_COLOR}"
&&
+patch "$SOURCE_DIRECTORY"/gtkdoc-fixxref.in \
+ "$SPELL_DIRECTORY"/bug612028.patch
diff --git a/gnome2-libs/gtk-doc/bug612028.patch
b/gnome2-libs/gtk-doc/bug612028.patch
new file mode 100644
index 0000000..275e1db
--- /dev/null
+++ b/gnome2-libs/gtk-doc/bug612028.patch
@@ -0,0 +1,18 @@
+#
+# From http://git.gnome.org/browse/gtk-doc/commit/?id=2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0
+# to fix https://bugzilla.gnome.org/show_bug.cgi?id=612028
+#
+
+diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in
+index 33a31b8..9f53852 100755
+--- a/gtkdoc-fixxref.in
++++ b/gtkdoc-fixxref.in
+@@ -464,7 +464,7 @@ sub HighlightSourceVim {
+ close (NEWFILE);
+
+ # format source
+- system "echo 'let html_number_lines=0|let html_use_css=1|let
use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|wa!|qa!' |
@HIGHLIGHT@ -n -e -u /dev/null -T xterm >/dev/null";
++ system "echo 'let html_number_lines=0|let html_use_css=1|let
use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|w!
$temp_source_file.html|qa!' | @HIGHLIGHT@ -n -e -u NONE -T xterm >/dev/null";
+
+ my $highlighted_source;
+ {
diff --git a/gnome2-libs/libcanberra/HISTORY b/gnome2-libs/libcanberra/HISTORY
index 7dd91a5..46ff1cf 100644
--- a/gnome2-libs/libcanberra/HISTORY
+++ b/gnome2-libs/libcanberra/HISTORY
@@ -1,3 +1,7 @@
+2010-10-06 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply make.patch
+ * make.patch: Fix make 3.82 syntax issues
+
2010-02-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.23
diff --git a/gnome2-libs/libcanberra/PRE_BUILD
b/gnome2-libs/libcanberra/PRE_BUILD
new file mode 100755
index 0000000..6c90aa8
--- /dev/null
+++ b/gnome2-libs/libcanberra/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+
+message "${MESSAGE_COLOR}Applying make 3.82 syntax patch...${DEFAULT_COLOR}"
&&
+patch "$SOURCE_DIRECTORY"/Makefile.in \
+ "$SPELL_DIRECTORY"/make.patch
diff --git a/gnome2-libs/libcanberra/make.patch
b/gnome2-libs/libcanberra/make.patch
new file mode 100644
index 0000000..6545d0a
--- /dev/null
+++ b/gnome2-libs/libcanberra/make.patch
@@ -0,0 +1,20 @@
+diff -Naur libcanberra-0.23.orig/Makefile.in libcanberra-0.23/Makefile.in
+--- libcanberra-0.23.orig/Makefile.in 2010-10-06 16:12:23.227000071 -0700
++++ libcanberra-0.23/Makefile.in 2010-10-06 16:16:31.841999901 -0700
+@@ -936,11 +936,11 @@
+
+
+ @GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@install-data-local:
+-@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ if test -z
"$(DESTDIR)" ; then \
+-@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ for p in
$(schemas_DATA) ; do \
+-@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL)
--makefile-install-rule $(top_builddir)/data/$$p ; \
+-@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ done \
+-@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ fi
++@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ if test -z "$(DESTDIR)" ;
then \
++@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ for p in
$(schemas_DATA) ; do \
++@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL)
--makefile-install-rule $(top_builddir)/$$p ; \
++@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ done \
++@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ fi
+ @GCONF_SCHEMAS_INSTALL_FALSE@@HAVE_GTK_TRUE@install-data-local:
+ @HAVE_GTK_FALSE@install-data-local:
+
diff --git a/graphics-libs/sane-backends/BUILD
b/graphics-libs/sane-backends/BUILD
index 89dc25e..c6c4817 100755
--- a/graphics-libs/sane-backends/BUILD
+++ b/graphics-libs/sane-backends/BUILD
@@ -3,9 +3,9 @@ create_group scanner &&
LDFLAGS="-pthread $LDFLAGS"
if [[ $USEFORK == y ]]; then
- OPTS="$OPTS --enable-fork-process"
+ OPTS="$OPTS --disable-pthread"
else
- OPTS="$OPTS --disable-fork-process"
+ OPTS="$OPTS --enable-pthread"
fi &&
if [[ $IPV6 == y ]]; then
@@ -24,6 +24,8 @@ if [[ "$SANE_BUILD_LOCAL" == n ]]; then
OPTS="$OPTS --disable-local-backends"
fi &&