Skip to Content.
Sympa Menu

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

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 (b401341682a2dbf27a47c57e72a801bcce35c8a7)
  • Date: Fri, 12 Nov 2010 12:58:18 -0600

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

http/icecat/BUILD | 8 ++++++--
http/icecat/CONFIGURE | 5 +----
http/icecat/DEPENDS | 10 +---------
http/icecat/DETAILS | 4 ++--
http/icecat/HISTORY | 6 ++++++
http/icecat/INSTALL | 5 -----
http/icecat/PRE_BUILD | 8 ++------
http/icecat/cairo-fixes.patch | 15 ---------------
http/icecat/mozconfig | 28 ++++++++++++++++++++++++++++
x11-libs/wine/CONFIGURE | 2 +-
x11-libs/wine/HISTORY | 3 +++
11 files changed, 50 insertions(+), 44 deletions(-)

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

icecat: version 3.6.12, cleaned up dependencies, removed obsolete patch

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

wine: removed maintainer-mode configure option for wine64

diff --git a/http/icecat/BUILD b/http/icecat/BUILD
index 709f45a..52a402a 100755
--- a/http/icecat/BUILD
+++ b/http/icecat/BUILD
@@ -12,7 +12,11 @@ then
OPTS="--enable-svg-renderer=$ICECAT_RENDER $OPTS"
fi &&

- OPTS="--enable-default-toolkit=$ICECAT_TOOLKIT $OPTS"
+case $ICECAT_TOOLKIT in
+ gtk2) OPTS="--enable-default-toolkit=cairo-gtk2" ;;
+ qt-x11) OPTS="--enable-default-toolkit=cairo-qt" ;;
+ *) message "unknown toolkit selected!" ; false ;;
+esac

[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=$HOST"

@@ -34,7 +38,7 @@ fi &&
--disable-installer \
--disable-pedantic \
--enable-single-profile \
- --enable-extensions="default,typeaheadfind" \
+ --enable-extensions="default" \
--enable-canvas \
$OPTS &&

diff --git a/http/icecat/CONFIGURE b/http/icecat/CONFIGURE
index 8e8b771..02a3813 100755
--- a/http/icecat/CONFIGURE
+++ b/http/icecat/CONFIGURE
@@ -28,12 +28,9 @@ config_query_option ICECAT_JS \
n \
'--enable-xpctools' \
'--disable-xpctools' &&
-config_query_list ICECAT_RENDER \
- 'Possible SVG renderers:' \
- 'cairo' 'libart' 'none' &&
config_query_list ICECAT_TOOLKIT \
'Possible graphics toolkits' \
- 'gtk' 'gtk2' 'qt-x11' 'xlib' &&
+ 'gtk2' 'qt-x11' &&

config_query ICECAT_NULLPLUGIN \
"Do you want nullplugin installed (to enable auto search and install of
other plugins)" \
diff --git a/http/icecat/DEPENDS b/http/icecat/DEPENDS
index e0e2b31..3e3c87b 100755
--- a/http/icecat/DEPENDS
+++ b/http/icecat/DEPENDS
@@ -2,19 +2,11 @@ depends g++ &&
depends zip &&
depends glib2 &&
depends xorg-libs "--with-x" &&
-
-case $ICECAT_RENDER in
- cairo) depends cairo ;;
- libart) depends libart_lgpl ;;
- *) true ;;
-esac &&
-
+depends cairo "--enable-system-cairo" &&
case $ICECAT_TOOLKIT in
- gtk) depends gtk+ ;;
gtk2) depends gtk+2 ;;
qt-x11) depends qt-x11 ;;
*) true ;;
-
esac &&

optional_depends libxft \
diff --git a/http/icecat/DETAILS b/http/icecat/DETAILS
index 9a440b8..06509b7 100755
--- a/http/icecat/DETAILS
+++ b/http/icecat/DETAILS
@@ -1,10 +1,10 @@
SPELL=icecat
- VERSION=2.0.0.13-g1
+ VERSION=3.6.12
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=${SOURCE}.sig
SOURCE_GPG="icecat.gpg:${SOURCE2}:UPSTREAM_KEY"
SOURCE2_IGNORE=signature
- SOURCE_URL[0]=http://gnuzilla.gnu.org/download/${SOURCE}
+ SOURCE_URL[0]=${GNU_URL}/gnuzilla/${VERSION}/${SOURCE}
SOURCE2_URL[0]=${SOURCE_URL}.sig
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://gnuzilla.gnu.org/
diff --git a/http/icecat/HISTORY b/http/icecat/HISTORY
index 9541838..ac5b931 100644
--- a/http/icecat/HISTORY
+++ b/http/icecat/HISTORY
@@ -1,3 +1,9 @@
+2010-11-09 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 3.6.12, corrected source URL
+ * BUILD, CONFIGURE, DEPENDS: depends on cairo, corrected toolkit
options
+ * PRE_BUILD, cairo-fixes.patch: removed obsolete patch
+ * INSTALL: removed pkgconfig fixes
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/http/icecat/INSTALL b/http/icecat/INSTALL
index 1a8a957..33af07e 100755
--- a/http/icecat/INSTALL
+++ b/http/icecat/INSTALL
@@ -38,11 +38,6 @@ then
rm $MOZILLA_HOME/plugins/libnullplugin.so
fi &&

-# make the pkgconfig files reference the nspr from the standalone nspr spell
-sedit 's/nspr/mozilla-nspr/'
${INSTALL_ROOT}/usr/lib/pkgconfig/icecat-js.pc &&
-sedit 's/nspr/mozilla-nspr/'
${INSTALL_ROOT}/usr/lib/pkgconfig/icecat-nss.pc &&
-sedit 's/nspr/mozilla-nspr/'
${INSTALL_ROOT}/usr/lib/pkgconfig/icecat-xpcom.pc &&
-
#
# install icecat script so it loads properly even if MOZILLA_FIVE_HOME is
# not set or set to a different mozilla/firefox directory
diff --git a/http/icecat/PRE_BUILD b/http/icecat/PRE_BUILD
index adc6b49..ad67b1d 100755
--- a/http/icecat/PRE_BUILD
+++ b/http/icecat/PRE_BUILD
@@ -3,10 +3,6 @@ default_pre_build &&
# remove /root/.mozconfig, it causes too much trouble
if [ -f /root/.mozconfig ]; then
rm -f /root/.mozconfig
-fi &&
+fi &&

-# remove broken .mozconfig shipped with 1.0b
-rm -f $SOURCE_DIRECTORY/.mozconfig &&
-
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch
+cp -v $SPELL_DIRECTORY/mozconfig .mozconfig
diff --git a/http/icecat/cairo-fixes.patch b/http/icecat/cairo-fixes.patch
deleted file mode 100644
index f11250e..0000000
--- a/http/icecat/cairo-fixes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/content/canvas/src/nsCanvasRenderingContext2D.cpp 2007-09-16
02:28:55.602763128 +0000
-+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp 2007-09-16
02:28:27.527046255 +0000
-@@ -98,6 +98,12 @@
- #include "nsTArray.h"
-
- #include "cairo.h"
-+typedef enum _cairo_font_type {
-+ CAIRO_FONT_TYPE_TOY,
-+ CAIRO_FONT_TYPE_FT,
-+ CAIRO_FONT_TYPE_WIN32,
-+ CAIRO_FONT_TYPE_ATSUI
-+} cairo_font_type_t;
- #include "imgIEncoder.h"
- #ifdef MOZILLA_1_8_BRANCH
- #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
diff --git a/http/icecat/mozconfig b/http/icecat/mozconfig
new file mode 100644
index 0000000..fa47e6e
--- /dev/null
+++ b/http/icecat/mozconfig
@@ -0,0 +1,28 @@
+#
+# See http://www.mozilla.org/build/ for build instructions.
+#
+
+# Options for client.mk.
+mk_add_options MOZ_CO_PROJECT=browser
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --with-pthreads
+ac_add_options --with-system-jpeg=/usr/lib
+ac_add_options --with-system-zlib=/usr/lib
+ac_add_options --with-system-png=/usr/lib
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --enable-application=browser
+ac_add_options --disable-system-cairo
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --disable-freetype2
+ac_add_options --enable-pango
+ac_add_options --disable-dbus
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --with-system-libxul
+ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-1.9
+ac_add_options --prefix=$INSTALL_ROOT/usr
+ac_add_options --mandir=$INSTALL_ROOT/usr
+ac_add_options --enable-optimize="$CFLAGS"
diff --git a/x11-libs/wine/CONFIGURE b/x11-libs/wine/CONFIGURE
index 3952bc4..a7a0d4d 100755
--- a/x11-libs/wine/CONFIGURE
+++ b/x11-libs/wine/CONFIGURE
@@ -4,7 +4,7 @@ if [[ "${ARCH}" = 'x86_64' ]]; then
message "Probably this is not what you want. If you say 'n' to the next
question" &&
message "an attempt will be made to build a 32bit Wine, which will fail if
you" &&
message "do not have a multilib system." &&
- config_query_option WINE64 'Build a 64bit Wine?' n '--enable-win64
--enable-maintainer-mode' ''
+ config_query_option WINE64 'Build a 64bit Wine?' n '--enable-win64' ''
fi &&

config_query WINE_SC2_LOGIN "Apply StarCraft II patches?" n
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index e9607b9..a5bacf2 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2010-11-12 Arjan Bouter <abouter AT sourcemage.org>
+ * CONFIGURE: removed maintainer-mode configure option for wine64
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG




  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (b401341682a2dbf27a47c57e72a801bcce35c8a7), Arjan Bouter, 11/12/2010

Archive powered by MHonArc 2.6.24.

Top of Page