Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (a3a8b54631d3fbf3022bdd19e0930c18b15a5247)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (a3a8b54631d3fbf3022bdd19e0930c18b15a5247)
  • Date: Thu, 29 Sep 2011 19:57:57 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

http/dillo/BUILD | 2 -
http/dillo/CONFIGURE | 72
+++++++--------------------------------------------
http/dillo/DEPENDS | 52 ++++++++++++++----------------------
http/dillo/DETAILS | 40 ++++++++++++++++------------
http/dillo/HISTORY | 3 ++
http/dillo/PREPARE | 9 ++----
http/dillo/PRE_BUILD | 15 ++--------
7 files changed, 67 insertions(+), 126 deletions(-)

New commits:
commit a3a8b54631d3fbf3022bdd19e0930c18b15a5247
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

dillo: Updated to version 3.0.1. Trying to get away from creating a
dillo3.

diff --git a/http/dillo/BUILD b/http/dillo/BUILD
index 778c21f..4e14560 100755
--- a/http/dillo/BUILD
+++ b/http/dillo/BUILD
@@ -1,2 +1,2 @@
-OPTS="$DILLO_OPTS $OPTS" &&
+OPTS="$OPTS $DILLO_OPTS"
default_build
diff --git a/http/dillo/CONFIGURE b/http/dillo/CONFIGURE
index 1d1fb6a..958f95c 100755
--- a/http/dillo/CONFIGURE
+++ b/http/dillo/CONFIGURE
@@ -1,61 +1,11 @@
-list_remove DILLO_OPTS "--enable-anti-alias" "--disable-anti-alias" &&
-if [[ $DILLO_TABS ]] ||
- [[ $DILLO_AA ]] ||
- [[ $DILLO_IPV6 ]] ||
- [[ $DILLO_RTFL ]] ||
- [[ $DILLO_COOKIES ]] ||
- [[ $DILLO_METAREF ]] ||
- [[ $DILLO_NLS ]]
-then
- #Save old vars
- DILLO_OPTS="$DILLO_TABS $DILLO_IPV6 $DILLO_RTFL \
- $DILLO_COOKIES $DILLO_METAREF $DILLO_NLS"
- #remove old vars
- persistent_remove DILLO_TABS DILLO_AA DILLO_IPV6 DILLO_RTFL \
- DILLO_COOKIES DILLO_METAREF DILLO_NLS
-fi &&
-config_query_option DILLO_OPTS \
- "Threaded DNS support?" \
- y \
- "--enable-threaded-dns" \
- "--disable-threaded-dns" &&
-if [[ "$I18NPATCH" == "y" ]]
-then
- config_query_option DILLO_OPTS \
- "Tab support" \
- y \
- "--enable-tabs" \
- "--disable-tabs"
-fi &&
-config_query_option DILLO_OPTS \
- "IPV6 support" \
- n \
- "--enable-ipv6" \
- "--disable-ipv6" &&
-#This is broken so forced on, 0.8.6 still broken,also dlgui
-DILLO_OPTS="$DILLO_OPTS --enable-cookies --disable-dlgui" &&
-#config_query_option DILLO_OPTS \
-# "Cookie support" \
-# y \
-# "--enable-cookies" \
-# "--disable-cookies" &&
-config_query_option DILLO_OPTS \
- "Allow meta refresh" \
- n \
- "--enable-meta-refresh" \
- "--disable-meta-refresh" &&
-config_query_option DILLO_OPTS \
- "Use native language support" \
- y \
- "--enable-nls" \
- "--disable-nls" &&
-config_query_option DILLO_OPTS \
- "Enable GIF support" \
- y \
- "--enable-gif" \
- "--disable-gif" &&
-config_query DILLO_HTTPS \
- "Enable experimental https support" \
- n \
- "" \
- ""
+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/dillo/DEPENDS b/http/dillo/DEPENDS
index c76e42d..a00ee92 100755
--- a/http/dillo/DEPENDS
+++ b/http/dillo/DEPENDS
@@ -1,39 +1,29 @@
-depends gtk+ &&
-depends glib &&
-depends zlib &&
-optional_depends "wget" \
- "" \
- "" \
- "for ftp tranfer support" &&
+if [[ "$DILLO_CVS" == "y" ]]; then
+depends libtool &&
+depends automake &&
+depends autoconf &&
+depends CVS
+fi &&

-optional_depends "electricfence" \
- "--enable-efence" \
- "--disable-efence" \
- "with Electric Fence" &&
-
-optional_depends "openssl" \
- "--enable-ssl" \
- "--disable-ssl" \
- "ssl support (eg. https)" &&
-
-optional_depends "krb5" \
- "" \
- "" \
- "kerberos5 support" &&
+depends fltk &&
+depends wget &&
+optional_depends "openssl" \
+ "--enable-ssl" \
+ "--disable-ssl" \
+ "for SSL support" &&

optional_depends "JPEG" \
"--enable-jpeg" \
"--disable-jpeg" \
"for jpeg image support" &&

-optional_depends "libpng" \
- "--enable-png" \
- "--disable-png" \
- "for png image support" &&
+optional_depends "giflib" \
+ "--enable-gif" \
+ "--disable-gif" \
+ "for gif image support" &&
+
+optional_depends "libpng" \
+ "--enable-png" \
+ "--disable-png" \
+ "for png image support"

-if [[ $I18NPATCH = y ]]; then
- optional_depends "libxft" \
- "--enable-anti-alias" \
- "--disable-anti-alias" \
- "for font anti-aliasing"
-fi
diff --git a/http/dillo/DETAILS b/http/dillo/DETAILS
index 92ae3ab..b627cbc 100755
--- a/http/dillo/DETAILS
+++ b/http/dillo/DETAILS
@@ -1,24 +1,30 @@
SPELL=dillo
- PATCHLEVEL=3
- VERSION=0.8.6
- PATCH_VERSION=20060516
- SOURCE=${SPELL}-${VERSION}.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL[0]=http://www.dillo.org/download/${SOURCE}
-
SOURCE_HASH=sha512:63c1306dc7d38716b4ee2459363bdda436f56edf1581271b3c17da189b8a96dc9f013b96d8b50126a5238d7333b0a82d48627eba5f72010ea5c660ab0c3b3995
-if [[ "$I18NPATCH" == "y" ]]
-then
- SOURCE2=${SPELL}-${VERSION}-i18n-misc-${PATCH_VERSION}.diff.bz2
- SOURCE2_URL[0]=http://teki.jpn.ph/pc/software/${SOURCE2}
-
SOURCE2_HASH=sha512:34775d70d49d7c87f1f2da19d264843c0b8c9bc5a714add2151ea586ed454816e1480fe0a93bfb4773280545941273946ad2bb2fbe9b93129cef53956833872a
+if [[ "$DILLO_CVS" == "y" ]]; then
+ if [ "$DILLO_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
+else
+ VERSION=3.0.1
+ SOURCE=dillo-$VERSION.tar.bz2
+ SOURCE_URL[0]=http://www.dillo.org/download/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/dillo-$VERSION
+
SOURCE_HASH=sha512:5342193ead9bfc807b900431131a82383298461568e87cc806781162844e52cb71562de31000d98af67174151eb4169284aba8bba562a2b5c44fba40c12fbf3e
fi
- WEB_SITE=http://www.dillo.org
- ENTERED=20010922
- KEYWORDS="web http"
- SHORT='Dillo is a very fast, extremely small web browser'
+ 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 GTK+, and it renders a good subset of
+is a graphical browser built upon FLTK, and it renders a good subset of
HTML, excluding frames, JavaScript, and JVM support.
EOF
diff --git a/http/dillo/HISTORY b/http/dillo/HISTORY
index bdef95b..d6391df 100644
--- a/http/dillo/HISTORY
+++ b/http/dillo/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 George Sherwood <gsherwood AT sourcemage.org>
+ * ALL: Updated to latest current. Verison 3.0.1
+
2011-01-02 Ismael Luceno <ismael AT sourcemage.org>
* dillo.desktop: added generic name

diff --git a/http/dillo/PREPARE b/http/dillo/PREPARE
index 054b47f..cbdecf2 100755
--- a/http/dillo/PREPARE
+++ b/http/dillo/PREPARE
@@ -1,5 +1,4 @@
-config_query I18NPATCH \
- "Apply i18n patch, contains many other things \
-(see http://teki.jpn.ph/pc/software/index-e.shtml)" \
- n
-
+config_query DILLO_CVS "Build CVS version?" n &&
+if [[ "$DILLO_CVS" == "y" ]]; then
+config_query DILLO_AUTOUPDATE "Automatically update on every system update?"
n
+fi
diff --git a/http/dillo/PRE_BUILD b/http/dillo/PRE_BUILD
index b849094..273f2ff 100755
--- a/http/dillo/PRE_BUILD
+++ b/http/dillo/PRE_BUILD
@@ -1,12 +1,5 @@
-default_pre_build &&
-
-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
+default_pre_build &&
+if [[ "$DILLO_CVS" == "y" ]]; then
+ cd $SOURCE_DIRECTORY &&
+ ./autogen.sh
fi



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (a3a8b54631d3fbf3022bdd19e0930c18b15a5247), George Sherwood, 09/29/2011

Archive powered by MHonArc 2.6.24.

Top of Page