Skip to Content.
Sympa Menu

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

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 (85030a7f03527c05554e858a652958f5504ccff4)
  • Date: Tue, 26 Aug 2008 15:36:18 -0500

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

http/dillo/CONFIGURE | 7 +++-
http/dillo/HISTORY | 4 ++
http/dillo/PRE_BUILD | 5 ++
http/dillo2/BUILD | 2 +
http/dillo2/CONFIGURE | 11 ++++++
http/dillo2/CONFLICTS | 1
http/dillo2/DEPENDS | 26 +++++++++++++++
http/dillo2/DETAILS | 22 ++++++++++++
http/dillo2/HISTORY | 3 +
http/dillo2/PREPARE | 1
http/dillo2/PRE_BUILD | 4 ++
http/dillo2/dillo2.patch | 77
+++++++++++++++++++++++++++++++++++++++++++++
libs/dw2/DEPENDS | 5 ++
libs/dw2/DETAILS | 19 +++++++++++
libs/dw2/HISTORY | 2 +
libs/dw2/INSTALL | 21 ++++++++++++
libs/dw2/PREPARE | 1
libs/dw2/PRE_BUILD | 4 ++
x11-toolkits/fltk2/DETAILS | 5 +-
x11-toolkits/fltk2/HISTORY | 3 +
20 files changed, 219 insertions(+), 4 deletions(-)

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

dillo: added experimental https support and conflicts with dillo2

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

fltk2: version bump to 2.0.x-r6159

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

dw2: support lib for dillo2

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

dillo2: new spell, experimental fltk2 based dillo

diff --git a/http/dillo/CONFIGURE b/http/dillo/CONFIGURE
index e95cb38..5f1a4ca 100755
--- a/http/dillo/CONFIGURE
+++ b/http/dillo/CONFIGURE
@@ -57,4 +57,9 @@ config_query_option DILLO_OPTS
\
"Enable GIF support" \
y \
"--enable-gif" \
- "--disable-gif"
+ "--disable-gif" &&
+config_query DILLO_HTTPS \
+ "Enable experimental https support" \
+ n \
+ "" \
+ ""
diff --git a/http/dillo/HISTORY b/http/dillo/HISTORY
index 0e7a357..1b5435b 100644
--- a/http/dillo/HISTORY
+++ b/http/dillo/HISTORY
@@ -1,3 +1,7 @@
+2008-08-26 Arjan Bouter <abouter AT sourcemage.org>
+ * CONFIGURE,PRE_BUILD: added experimental https support
+ * CONFLICTS: added
+
2007-05-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: removed libungif optional_depends, dillo has its own gif
decoder
diff --git a/http/dillo/PRE_BUILD b/http/dillo/PRE_BUILD
index 6c7cfc8..b849094 100755
--- a/http/dillo/PRE_BUILD
+++ b/http/dillo/PRE_BUILD
@@ -4,4 +4,9 @@ if [ "$I18NPATCH" = "y" ] ; then
cd $SOURCE_DIRECTORY &&
unpack_file "2" &&
bzcat $SOURCE_CACHE/$SOURCE2 | patch -p1
+fi &&
+
+if [ "$DILLO_HTTPS" = "y" ] ; then
+ cd $SOURCE_DIRECTORY &&
+ sedit '/#undef ENABLE_SSL/d' dpi/https.c
fi
diff --git a/http/dillo2/BUILD b/http/dillo2/BUILD
new file mode 100755
index 0000000..4e14560
--- /dev/null
+++ b/http/dillo2/BUILD
@@ -0,0 +1,2 @@
+OPTS="$OPTS $DILLO_OPTS"
+default_build
diff --git a/http/dillo2/CONFIGURE b/http/dillo2/CONFIGURE
new file mode 100755
index 0000000..958f95c
--- /dev/null
+++ b/http/dillo2/CONFIGURE
@@ -0,0 +1,11 @@
+config_query_option DILLO_OPTS \
+ "Threaded DNS support?" \
+ y \
+ "--enable-threaded-dns" \
+ "--disable-threaded-dns" &&
+
+config_query_option DILLO_OPTS \
+ "Threaded IPv6 support?" \
+ y \
+ "--enable-ipv6" \
+ "--disable-ipv6"
diff --git a/http/dillo2/CONFLICTS b/http/dillo2/CONFLICTS
new file mode 100755
index 0000000..d3044d1
--- /dev/null
+++ b/http/dillo2/CONFLICTS
@@ -0,0 +1 @@
+conflicts dillo
diff --git a/http/dillo2/DEPENDS b/http/dillo2/DEPENDS
new file mode 100755
index 0000000..6554995
--- /dev/null
+++ b/http/dillo2/DEPENDS
@@ -0,0 +1,26 @@
+depends libtool &&
+depends automake &&
+depends autoconf &&
+depends CVS &&
+depends dw2 &&
+depends wget &&
+
+optional_depends "jpeg" \
+ "--enable-jpeg" \
+ "--disable-jpeg" \
+ "for jpeg image support" &&
+
+optional_depends "giflib" \
+ "--enable-gif" \
+ "--disable-gif" \
+ "for gif image support" &&
+
+optional_depends "jpeg" \
+ "--enable-jpeg" \
+ "--disable-jpeg" \
+ "for jpeg image support" &&
+
+optional_depends "openssl" \
+ "--enable-ssl" \
+ "--disable-ssl" \
+ "for SSL support"
diff --git a/http/dillo2/DETAILS b/http/dillo2/DETAILS
new file mode 100755
index 0000000..29bb4f5
--- /dev/null
+++ b/http/dillo2/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=dillo2
+ if [ "$DILLO2_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2
+ FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+
SOURCE_URL[0]=cvs://:pserver:anonymous AT auriga.wearlab.de:/sfhome/cvs/dillo:$SPELL
+ SOURCE_IGNORE=volatile
+ LICENSE[0]=GPL
+ WEB_SITE=http://dillo.org
+ ENTERED=20080826
+ KEYWORDS="http"
+ SHORT="dillo2 is the experimental fltk2 port of dillo"
+cat << EOF
+Dillo is a very fast, extremely small Web browser that's completely
+written in C. The source and binary are less than 300 kilobytes each. It
+is a graphical browser built upon FLTK2, and it renders a good subset of
+HTML, excluding frames, JavaScript, and JVM support.
+EOF
diff --git a/http/dillo2/HISTORY b/http/dillo2/HISTORY
new file mode 100644
index 0000000..6b6ff04
--- /dev/null
+++ b/http/dillo2/HISTORY
@@ -0,0 +1,3 @@
+2008-08-26 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD,CONFIGURE,CONFLICTS,DEPENDS,DETAILS,dillo2.patch,
+ HISTORY,PRE_BUILD,PREPARE: added spell
diff --git a/http/dillo2/PREPARE b/http/dillo2/PREPARE
new file mode 100755
index 0000000..175aba6
--- /dev/null
+++ b/http/dillo2/PREPARE
@@ -0,0 +1 @@
+config_query DILLO2_AUTOUPDATE "Automatically update on every system
update?" n
diff --git a/http/dillo2/PRE_BUILD b/http/dillo2/PRE_BUILD
new file mode 100755
index 0000000..a3eec72
--- /dev/null
+++ b/http/dillo2/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/dillo2.patch &&
+./autogen.sh
diff --git a/http/dillo2/dillo2.patch b/http/dillo2/dillo2.patch
new file mode 100644
index 0000000..2a94e09
--- /dev/null
+++ b/http/dillo2/dillo2.patch
@@ -0,0 +1,77 @@
+diff -Naur dillo2-cvs/CVS/Entries dillo2-cvs-fixed/CVS/Entries
+--- dillo2-cvs/CVS/Entries 2008-08-26 20:23:07.000000000 +0200
++++ dillo2-cvs-fixed/CVS/Entries 2008-08-26 20:17:28.420559878 +0200
+@@ -11,9 +11,4 @@
+ /configure.in/1.18/Thu Jul 3 13:11:55 2008//THEAD
+ /dillo2rc/1.1/Sat Aug 23 21:53:05 2008//THEAD
+ /install-dpi-local/1.1.1.1/Sat Oct 6 22:36:34 2007//THEAD
+-D/dlib////
+-D/doc////
+-D/dpi////
+-D/dpid////
+-D/dpip////
+-D/src////
++D
+diff -Naur dillo2-cvs/CVS/Entries.Log dillo2-cvs-fixed/CVS/Entries.Log
+--- dillo2-cvs/CVS/Entries.Log 1970-01-01 01:00:00.000000000 +0100
++++ dillo2-cvs-fixed/CVS/Entries.Log 2008-08-26 20:17:28.420559878 +0200
+@@ -0,0 +1,6 @@
++A D/dlib////
++A D/doc////
++A D/dpi////
++A D/dpid////
++A D/dpip////
++A D/src////
+diff -Naur dillo2-cvs/src/CVS/Entries dillo2-cvs-fixed/src/CVS/Entries
+--- dillo2-cvs/src/CVS/Entries 2008-08-26 20:23:07.000000000 +0200
++++ dillo2-cvs-fixed/src/CVS/Entries 2008-08-26 20:17:28.410559229 +0200
+@@ -72,4 +72,4 @@
+ /url.h/1.5/Sat May 10 19:52:09 2008//THEAD
+ /web.cc/1.6/Fri Jun 27 18:21:53 2008//THEAD
+ /web.hh/1.1.1.1/Sat Oct 6 22:36:34 2007//THEAD
+-D/IO////
++D
+diff -Naur dillo2-cvs/src/CVS/Entries.Log
dillo2-cvs-fixed/src/CVS/Entries.Log
+--- dillo2-cvs/src/CVS/Entries.Log 1970-01-01 01:00:00.000000000 +0100
++++ dillo2-cvs-fixed/src/CVS/Entries.Log 2008-08-26 20:17:28.410559229
+0200
+@@ -0,0 +1 @@
++A D/IO////
+diff -Naur dillo2-cvs/src/Makefile.am dillo2-cvs-fixed/src/Makefile.am
+--- dillo2-cvs/src/Makefile.am 2008-08-23 23:53:05.000000000 +0200
++++ dillo2-cvs-fixed/src/Makefile.am 2008-08-26 20:19:47.598031864 +0200
+@@ -1,6 +1,6 @@
+ AM_CPPFLAGS=-DDILLORC_SYS='"$(sysconfdir)/dillo2rc"' @LIBJPEG_CPPFLAGS@
+-AM_CFLAGS = -I../../dw-testbed @LIBPNG_CFLAGS@
+-AM_CXXFLAGS = -I../../dw-testbed @LIBPNG_CFLAGS@ @LIBFLTK_CXXFLAGS@
++AM_CFLAGS = -I/usr/include/dw @LIBPNG_CFLAGS@
++AM_CXXFLAGS = -I/usr/include/dw @LIBPNG_CFLAGS@ @LIBFLTK_CXXFLAGS@
+
+ SUBDIRS = IO
+
+@@ -10,10 +10,10 @@
+ ../dlib/libDlib.a \
+ ../dpip/libDpip.a \
+ IO/libDiof.a \
+- ../../dw-testbed/dw/libDw-widgets.a \
+- ../../dw-testbed/dw/libDw-fltk.a \
+- ../../dw-testbed/dw/libDw-core.a \
+- ../../dw-testbed/lout/liblout.a \
++ /usr/lib/dw/libDw-widgets.a \
++ /usr/lib/dw/libDw-fltk.a \
++ /usr/lib/dw/libDw-core.a \
++ /usr/lib/lout/liblout.a \
+ @LIBJPEG_LIBS@ @LIBPNG_LIBS@ @LIBFLTK_LIBS@ @LIBZ_LIBS@
@LIBICONV_LIBS@
+
+ dillo_fltk_SOURCES = \
+diff -Naur dillo2-cvs/src/srch dillo2-cvs-fixed/src/srch
+--- dillo2-cvs/src/srch 2007-10-07 00:36:34.000000000 +0200
++++ dillo2-cvs-fixed/src/srch 2008-08-26 20:21:17.973869139 +0200
+@@ -28,6 +28,5 @@
+
+ #egrep $FLAGS "$1" dw/*[ch]
+ #egrep $FLAGS "$1" lout/*[ch]
+-egrep $FLAGS "$1" ../../dw-testbed/dw/*[ch]
+-egrep $FLAGS "$1" ../../dw-testbed/lout/*[ch]
+-
++egrep $FLAGS "$1" /usr/include/dw/*[ch]
++egrep $FLAGS "$1" /usr/include/lout/*[ch]
diff --git a/libs/dw2/DEPENDS b/libs/dw2/DEPENDS
new file mode 100755
index 0000000..a437738
--- /dev/null
+++ b/libs/dw2/DEPENDS
@@ -0,0 +1,5 @@
+depends libtool &&
+depends automake &&
+depends autoconf &&
+depends CVS &&
+depends fltk2
diff --git a/libs/dw2/DETAILS b/libs/dw2/DETAILS
new file mode 100755
index 0000000..d3beba0
--- /dev/null
+++ b/libs/dw2/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=dw2
+ if [ "$DW2_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2
+ FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+
SOURCE_URL[0]=cvs://:pserver:anonymous AT auriga.wearlab.de:/sfhome/cvs/dillo:$SPELL
+ SOURCE_IGNORE=volatile
+ LICENSE[0]=GPL
+ WEB_SITE=http://dillo.org
+ ENTERED=20080826
+ KEYWORDS="http"
+ SHORT="dw2 is a support lib for dillo2"
+cat << EOF
+dw2 is a support lib for dillo.
+EOF
diff --git a/libs/dw2/HISTORY b/libs/dw2/HISTORY
new file mode 100644
index 0000000..d233fe1
--- /dev/null
+++ b/libs/dw2/HISTORY
@@ -0,0 +1,2 @@
+2008-08-26 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS,DETAILS,HISTORY,INSTALL,PRE_BUILD,PREPARE: added spell
diff --git a/libs/dw2/INSTALL b/libs/dw2/INSTALL
new file mode 100755
index 0000000..a099735
--- /dev/null
+++ b/libs/dw2/INSTALL
@@ -0,0 +1,21 @@
+default_install &&
+
+if [ ! -d $INSTALL_ROOT/usr/include/dw ]; then
+ install -d $INSTALL_ROOT/usr/include/dw
+fi &&
+install -t $INSTALL_ROOT/usr/include/dw dw/*[ch] &&
+
+if [ ! -d $INSTALL_ROOT/usr/lib/dw ]; then
+ install -d $INSTALL_ROOT/usr/lib/dw
+fi &&
+install -t $INSTALL_ROOT/usr/lib/dw dw/*.a &&
+
+if [ ! -d $INSTALL_ROOT/usr/lib/lout ]; then
+ install -d $INSTALL_ROOT/usr/lib/lout
+fi &&
+install -t $INSTALL_ROOT/usr/lib/lout lout/*.a &&
+
+if [ ! -d $INSTALL_ROOT/usr/include/lout ]; then
+ install -d $INSTALL_ROOT/usr/include/lout
+fi &&
+install -t $INSTALL_ROOT/usr/include/lout lout/*[ch]
diff --git a/libs/dw2/PREPARE b/libs/dw2/PREPARE
new file mode 100755
index 0000000..bfb59bb
--- /dev/null
+++ b/libs/dw2/PREPARE
@@ -0,0 +1 @@
+config_query DW2_AUTOUPDATE "Automatically update on every system update?" n
diff --git a/libs/dw2/PRE_BUILD b/libs/dw2/PRE_BUILD
new file mode 100755
index 0000000..f715458
--- /dev/null
+++ b/libs/dw2/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+./autogen.sh
+
diff --git a/x11-toolkits/fltk2/DETAILS b/x11-toolkits/fltk2/DETAILS
index 668440c..b1e2334 100755
--- a/x11-toolkits/fltk2/DETAILS
+++ b/x11-toolkits/fltk2/DETAILS
@@ -1,10 +1,9 @@
SPELL=fltk2
- VERSION=2.0.x-r5940
-
SOURCE_HASH=sha512:d3362e395fe1ab2e2a2c6240b707f46a5fbf1b7c03bba42f5b7e69cb442a990142d79a3a9d480129664e0827553db79da87efd7c2ee94c7d8932d7349b52fd05
+ VERSION=2.0.x-r6159
+
SOURCE_HASH=sha512:7f459fc784e70ba5ca69472d409b94820b92294ea83f0ede2fb33a8643672b5a8e478dfe47a3fd1e389d5fb93819b43098f2f2eff60e680b5932f425eb6bd311
SOURCE=${SPELL//2}-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//2}-$VERSION
FLTK_URI=ftp.easysw.com/pub/fltk/snapshots/$SOURCE
-# SOURCE_URL[1]=ftp://ftp.funet.fi/pub/mirrors/${FLTK_URI/p3/p}
SOURCE_URL[0]=ftp://$FLTK_URI
LICENSE[0]=GPL
WEB_SITE=http://www.fltk.org/
diff --git a/x11-toolkits/fltk2/HISTORY b/x11-toolkits/fltk2/HISTORY
index c111d11..07846fd 100644
--- a/x11-toolkits/fltk2/HISTORY
+++ b/x11-toolkits/fltk2/HISTORY
@@ -1,3 +1,6 @@
+2008-08-26 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 6159
+
2007-08-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.x-r5940
change url




Archive powered by MHonArc 2.6.24.

Top of Page