Skip to Content.
Sympa Menu

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

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 (afe0cbb003146ae8d7cd3462e2f071a60d66b17a)
  • Date: Fri, 26 Sep 2008 11:54:48 -0500

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

http/dillo2/HISTORY | 4 ++
http/dillo2/PRE_BUILD | 1
http/dillo2/dillo2.patch | 77
-----------------------------------------------
xorg-app/compiz/DEPENDS | 69 +++++++++++++++++++++++++++++++++++++++---
xorg-app/compiz/HISTORY | 3 +
5 files changed, 71 insertions(+), 83 deletions(-)

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

dillo2: removed obsolete patch

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

compiz: added most missing optional_depends

diff --git a/http/dillo2/HISTORY b/http/dillo2/HISTORY
index 6b6ff04..a0ea98e 100644
--- a/http/dillo2/HISTORY
+++ b/http/dillo2/HISTORY
@@ -1,3 +1,7 @@
+2008-09-26 Arjan Bouter <abouter AT sourcemage.org>
+ * dillo2.patch: removed
+ * PRE_BUILD: dillo2.patch not needed anymore
+
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/PRE_BUILD b/http/dillo2/PRE_BUILD
index a3eec72..821d675 100755
--- a/http/dillo2/PRE_BUILD
+++ b/http/dillo2/PRE_BUILD
@@ -1,4 +1,3 @@
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
deleted file mode 100644
index 2a94e09..0000000
--- a/http/dillo2/dillo2.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-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/xorg-app/compiz/DEPENDS b/xorg-app/compiz/DEPENDS
index 66919bb..b46e397 100755
--- a/xorg-app/compiz/DEPENDS
+++ b/xorg-app/compiz/DEPENDS
@@ -9,17 +9,76 @@ depends libxdamage &&
depends libxinerama &&
depends libxrandr &&
depends -sub 'XCOMPOSITE' xorg-server &&
-depends gconf2 &&

# XXX: that's hardly all, but those are the ones that
# I reckon people are most likely to *not* want -- Lalo
+# Added a couple more, these 3 still need checking -- abouter
+#
+# --disable-annotate Disable annotate plugin
+# --disable-gnome-keybindings Disable gnome keybindings
+# --disable-kconfig Disable kconfig plugin

-optional_depends kdelibs4 \
+optional_depends kdelibs \
"--enable-kde" \
"--disable-kde" \
- "Build KDE window decorator" &&
+ "Build KDE window decorator" &&
+
+optional_depends kdelibs4 \
+ "--enable-kde4" \
+ "--disable-kde4" \
+ "Build KDE4 window decorator" &&

-optional_depends gtk+2 \
+optional_depends GTK2 \
"--enable-gtk" \
"--disable-gtk" \
- "Build GTK+ window decorator"
+ "Build GTK+ window decorator" &&
+
+optional_depends gconf2 \
+ "--enable-gconf" \
+ "--disable-gconf" \
+ "Use gconf to store settings" &&
+
+optional_depends glib \
+ "--enable-glib" \
+ "--disable-glib" \
+ "Enable glib plugin" &&
+
+optional_depends dbus \
+ "--enable-dbus" \
+ "--disable-dbus" \
+ "Enable dbus plugin?" &&
+
+optional_depends dbus-glib \
+ "--enable-dbus-glib" \
+ "--disable-dbus-glib" \
+ "Enable dbus-glib plugin?" &&
+
+optional_depends libnotify \
+ "--enable-inotify" \
+ "--disable-inotify" \
+ "Enable inotify plugin?" &&
+
+optional_depends fuse \
+ "--enable-fuse" \
+ "--disable-fuse" \
+ "Enable fuse plugin?" &&
+
+optional_depends librsvg2 \
+ "--enable-librsvg" \
+ "--disable-librsvg" \
+ "Enable SVG support?" &&
+
+optional_depends metacity \
+ "--enable-metacity" \
+ "--disable-metacity" \
+ "Enable metacity theme support?" &&
+
+optional_depends libnotify \
+ "--enable-inotify" \
+ "--disable-inotify" \
+ "Enable inotify plugin?" &&
+
+optional_depends libgnome \
+ "--enable-gnome" \
+ "--disable-gnome" \
+ "Enable gnome settings module?"
diff --git a/xorg-app/compiz/HISTORY b/xorg-app/compiz/HISTORY
index 0ccd930..bb88da7 100644
--- a/xorg-app/compiz/HISTORY
+++ b/xorg-app/compiz/HISTORY
@@ -1,3 +1,6 @@
+2008-09-26 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added most missing optionals
+
2008-08-20 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DEPENDS: added gconf2 as a dependency




  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (afe0cbb003146ae8d7cd3462e2f071a60d66b17a), Arjan Bouter, 09/26/2008

Archive powered by MHonArc 2.6.24.

Top of Page