[SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (6552f4bdcfb3d5b42a473452123cc2c2e2378ab9)

Treeve Jelbert scm at sourcemage.org
Thu Jan 12 03:22:44 EST 2012


GIT changes to devel-xorg-modular grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 dev/null                                                                          |binary
 disk/grub2/BUILD                                                                  |    2 
 disk/grub2/HISTORY                                                                |    3 
 gnome2-apps/gedit/DETAILS                                                         |    2 
 gnome2-apps/gedit/HISTORY                                                         |    3 
 gnome2-apps/gedit/gedit-3.2.5.tar.xz.sig                                          |    0 
 gnome2-apps/gedit/gedit-3.2.6.tar.xz.sig                                          |binary
 gnome2-apps/planner/DEPENDS                                                       |   26 +-
 gnome2-apps/planner/DETAILS                                                       |    4 
 gnome2-apps/planner/HISTORY                                                       |   12 +
 gnome2-apps/planner/PRE_BUILD                                                     |    9 
 gnome2-apps/planner/planner-0.14.3.tar.gz.sig                                     |    0 
 gnome2-apps/planner/planner-0.14.6.tar.xz.sig                                     |binary
 gnome2-apps/planner/planner-evolution-fix.diff                                    |  115 ----------
 gnome2-libs/glib-networking/DETAILS                                               |    4 
 gnome2-libs/glib-networking/HISTORY                                               |    5 
 gnome2-libs/glib-networking/PRE_BUILD                                             |    5 
 gnome2-libs/glib-networking/glib-networking-2.30.1.tar.bz2.sig                    |    0 
 gnome2-libs/glib-networking/glib-networking-2.30.2.tar.xz.sig                     |binary
 gnome2-libs/glib2/DETAILS                                                         |    2 
 gnome2-libs/glib2/HISTORY                                                         |    3 
 gnome2-libs/glib2/glib-2.31.6.tar.xz.sig                                          |    0 
 gnome2-libs/glib2/glib-2.31.8.tar.xz.sig                                          |binary
 gnome2-libs/gnome-nettool/DEPENDS                                                 |    2 
 gnome2-libs/gnome-nettool/DETAILS                                                 |    4 
 gnome2-libs/gnome-nettool/HISTORY                                                 |    6 
 gnome2-libs/gnome-nettool/PRE_BUILD                                               |    5 
 gnome2-libs/gnome-nettool/gnome-nettool-2.32.0.tar.bz2.sig                        |    0 
 gnome2-libs/gnome-nettool/gnome-nettool-3.0.1.tar.xz.sig                          |binary
 gnome2-libs/gtkhtml2/DETAILS                                                      |    4 
 gnome2-libs/gtkhtml2/HISTORY                                                      |    5 
 gnome2-libs/gtkhtml2/PRE_BUILD                                                    |    5 
 gnome2-libs/gtkhtml2/gtkhtml-4.2.2.tar.bz2.sig                                    |    0 
 gnome2-libs/gtkhtml2/gtkhtml-4.2.3.tar.xz.sig                                     |binary
 gnome3-libs/gnome-icon-theme-symbolic/DETAILS                                     |    4 
 gnome3-libs/gnome-icon-theme-symbolic/HISTORY                                     |    5 
 gnome3-libs/gnome-icon-theme-symbolic/PRE_BUILD                                   |    5 
 gnome3-libs/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.2.1.tar.bz2.sig |    0 
 gnome3-libs/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.2.2.tar.xz.sig  |binary
 graphics/gimp/DEPENDS                                                             |    2 
 graphics/gimp/HISTORY                                                             |    3 
 libs/ldns/BUILD                                                                   |    8 
 libs/ldns/CONFIGURE                                                               |    5 
 libs/ldns/DETAILS                                                                 |    4 
 libs/ldns/HISTORY                                                                 |    5 
 libs/ldns/INSTALL                                                                 |    3 
 mail/alpine/DETAILS                                                               |    2 
 mail/alpine/HISTORY                                                               |    3 
 net/whois/DETAILS                                                                 |    4 
 net/whois/HISTORY                                                                 |    3 
 security/wireshark/DETAILS                                                        |    6 
 security/wireshark/HISTORY                                                        |    4 
 security/wireshark/PRE_BUILD                                                      |    4 
 security/wireshark/dumpcap.patch                                                  |   12 -
 54 files changed, 135 insertions(+), 173 deletions(-)

New commits:
commit 98cc3689785256fd4454c4277d0a12bb73a241a8
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    gtkhtml2: => 4.2.3
    bz2 -> xz
    PRE_BUILD added to handle xz archive

commit e32b1f2855fd718c90213a79721fd9fa18a9fc09
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    gnome-icon-theme-symbolic: => 3.2.2
    bz2 -> xz
    PRE_BUILD added to handle xz archive

commit bbcda63507a13b4496ff5254fc1abb0a02762486
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    ldns 1.6.12, drill and examples are optional now

commit ef2c9c334d6641f7c4b68842af23aa54547530b5
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    disk/grub2: forced disable_pic for all architectures

commit c799a1e3a48a904650a5cd932912c2f13798912d
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    alpine: topal version update to 74

commit fba7aafe2a11f69cd2d698e151abb13bfe7551de
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    gimp: jpeg -> JPEG

commit bb53ac5be7a5ff0246cb6aec9815e5a0b81f6d67
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    whois: version 5.0.14

commit a1186c394a6eb170f6852193b4ec3b1e850adc30
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    wireshark 1.6.5, SECURITY_PATCH=34

commit 1bcbfd81d98aecd02be554d210aa6b422383852a
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    glib2: devel => 2.31.8

commit 314a8f35f36b6ac404c57fb913b2e0025fd9c9a5
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    glib-networking: => 2.30.2
    bz2 -> xz
    PRE_BUILD added to handle xz archive

commit 04153902331c8ebfc24c4396ac493a36242421f8
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    planner: => 0.14.6
    gz -> xz
    DEPENDS:   Removed libgnomeprintui, libgsf, libgda3
               Added libgnomecanvas, libgda3, libxml2, libxslt, glib2, gtk+2, pygtk2
               Added optional_depends on python and gtk-doc
               Fixed configure flags for postgresql
    
    PRE_BUILD: Removed planner-evolution-fix.diff patch since it no longer compiles
               Added handling of xz archive

commit c2e1013e955ad7f1eb2bfba8e280f31378bf8082
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    gnome-nettool: => 3.0.1
    bz2 -> xz
    
    DEPENDS: gtk+2 -> gtk+3
    
    PRE_BUILD: added to handle xz archive

commit 434a0e505d66ae0ba7ce6e44dff78ac2837bddaa
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    gedit: => 3.2.6

diff --git a/disk/grub2/BUILD b/disk/grub2/BUILD
index b70dd37..e9092c9 100755
--- a/disk/grub2/BUILD
+++ b/disk/grub2/BUILD
@@ -1,4 +1,4 @@
 OPTS="${OPTS} ${GRUB2_OPTS} -disable-werror" &&
 CFLAGS=${CFLAGS/-m64/} &&
-disable_pic &&
+disable_pic force &&
 default_build
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index 8d8f640..45ae6ce 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,6 @@
+2012-01-11 Pol Vinogradov <vin.public at gmail.com>
+	* BUILD: force disable_pic for all architectures
+
 2012-01-10 Eric Sandall <sandalle at sourcemage.org>
 	* BUILD: Remove debugging echo
 	  Disable PIC for x86
diff --git a/gnome2-apps/gedit/DETAILS b/gnome2-apps/gedit/DETAILS
index 8e0eb5b..04c3e02 100755
--- a/gnome2-apps/gedit/DETAILS
+++ b/gnome2-apps/gedit/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gedit
-         VERSION=3.2.5
+         VERSION=3.2.6
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/gedit/HISTORY b/gnome2-apps/gedit/HISTORY
index 6345e05..29dcb93 100644
--- a/gnome2-apps/gedit/HISTORY
+++ b/gnome2-apps/gedit/HISTORY
@@ -1,3 +1,6 @@
+2012-01-10 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 3.2.6
+
 2011-12-10 Sukneet Basuta <sukneet at sourcemage.org>
 	* DETAILS: updated spell to 3.2.5
 	  bz2 -> xz
diff --git a/gnome2-apps/gedit/gedit-3.2.5.tar.xz.sig b/gnome2-apps/gedit/gedit-3.2.5.tar.xz.sig
deleted file mode 100644
index 0c28e42..0000000
Binary files a/gnome2-apps/gedit/gedit-3.2.5.tar.xz.sig and /dev/null differ
diff --git a/gnome2-apps/gedit/gedit-3.2.6.tar.xz.sig b/gnome2-apps/gedit/gedit-3.2.6.tar.xz.sig
new file mode 100644
index 0000000..8062786
Binary files /dev/null and b/gnome2-apps/gedit/gedit-3.2.6.tar.xz.sig differ
diff --git a/gnome2-apps/planner/DEPENDS b/gnome2-apps/planner/DEPENDS
index 6de119e..cafdc0b 100755
--- a/gnome2-apps/planner/DEPENDS
+++ b/gnome2-apps/planner/DEPENDS
@@ -1,17 +1,31 @@
 depends  libgnomeui       &&
-depends  libgnomeprintui  &&
+depends  libgnomecanvas   &&
 depends  libglade2        &&
 depends  gconf2           &&
-depends  libgsf           &&
-depends  libgda2          &&
+depends  libgda3          &&
 depends  rarian           &&
+depends  libxml2          &&
+depends  libxslt          &&
+depends  glib2            &&
+depends  gtk+2            &&
+depends  pygtk2           &&
 
 optional_depends postgresql                             \
-                 "--enable-database=yes"                \
-                 "--enable-database=no"                 \
+                 "--with-database"                      \
+                 "--without-database"                   \
                  "For database support"                 &&
 
 optional_depends evolution-data-server                  \
                  "--enable-eds --enable-eds-backend"    \
                  "--disable-eds --disable-eds-backend"  \
-                 "For evolution-data-server support"    
+                 "For evolution-data-server support"    &&
+
+optional_depends python                                    \
+                "--enable-python --enable-python-plugin"   \
+                "--disable-python --disable-python-plugin" \
+                "To build python plugin and bindings"      &&
+
+optional_depends gtk-doc                                \
+                 "--enable-gtk-doc"                     \
+                 "--disable-gtk-doc"                    \
+                 "To build documentation"
diff --git a/gnome2-apps/planner/DETAILS b/gnome2-apps/planner/DETAILS
index 53dfd29..885bc3f 100755
--- a/gnome2-apps/planner/DETAILS
+++ b/gnome2-apps/planner/DETAILS
@@ -1,7 +1,7 @@
            SPELL=planner
-         VERSION=0.14.3
+         VERSION=0.14.6
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
-          SOURCE=$SPELL-$VERSION.tar.gz
+          SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome2-apps/planner/HISTORY b/gnome2-apps/planner/HISTORY
index 0a8fe7b..c7ec687 100644
--- a/gnome2-apps/planner/HISTORY
+++ b/gnome2-apps/planner/HISTORY
@@ -1,3 +1,15 @@
+2012-01-10 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 0.14.6
+	  gz -> xz
+	* DEPENDS: removed libgnomeprintui, libgsf, libgda3
+	  Added libgnomecanvas, libgda3, libxml2, libxslt, 
+	  glib2, gtk+2, pygtk2
+	  Added optional_depends on python and gtk-doc
+	  Fixed configure flags for postgresql
+	* PRE_BUILD: removed patch
+	  changed to handle xz archive
+	* planner-evolution-fix.diff: removed, no longer compiles
+
 2010-07-11 Ismael Luceno <ismael at sourcemage.org>
 	* DEPENDS: added rarian
 
diff --git a/gnome2-apps/planner/PRE_BUILD b/gnome2-apps/planner/PRE_BUILD
index 327e79c..8240c01 100755
--- a/gnome2-apps/planner/PRE_BUILD
+++ b/gnome2-apps/planner/PRE_BUILD
@@ -1,4 +1,5 @@
-default_pre_build       &&
-cd ${SOURCE_DIRECTORY}  &&
-
-patch -p1 < ${SCRIPT_DIRECTORY}/planner-evolution-fix.diff
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $BUILD_DIRECTORY &&
+verify_file '' &&
+xz -dc $SOURCE_CACHE/$SOURCE | tar -xf - &&
+cd $SOURCE_DIRECTORY
diff --git a/gnome2-apps/planner/planner-0.14.3.tar.gz.sig b/gnome2-apps/planner/planner-0.14.3.tar.gz.sig
deleted file mode 100644
index 8028afc..0000000
Binary files a/gnome2-apps/planner/planner-0.14.3.tar.gz.sig and /dev/null differ
diff --git a/gnome2-apps/planner/planner-0.14.6.tar.xz.sig b/gnome2-apps/planner/planner-0.14.6.tar.xz.sig
new file mode 100644
index 0000000..df64df6
Binary files /dev/null and b/gnome2-apps/planner/planner-0.14.6.tar.xz.sig differ
diff --git a/gnome2-apps/planner/planner-evolution-fix.diff b/gnome2-apps/planner/planner-evolution-fix.diff
deleted file mode 100644
index 2ad6e0f..0000000
--- a/gnome2-apps/planner/planner-evolution-fix.diff
+++ /dev/null
@@ -1,115 +0,0 @@
-Only in planner.mod: config.log
-diff -u -r planner-0.14.3/configure planner.mod/configure
---- planner-0.14.3/configure	2008-04-12 11:14:43.000000000 -0500
-+++ planner.mod/configure	2008-04-19 18:41:45.000000000 -0500
-@@ -25655,13 +25655,13 @@
- 		libecal-\$EDS_PACKAGE >= \$EDS_REQUIRED
-     		libedata-cal-\$EDS_PACKAGE >= \$EDS_REQUIRED
-     		libedataserver-\$EDS_PACKAGE >= \$EDS_REQUIRED
--    		evolution-plugin-\$EVOLUTION_PACKAGE >= \$EVOLUTION_REQUIRED
-+    		evolution-plugin >= \$EVOLUTION_REQUIRED
-     \"") >&5
-   ($PKG_CONFIG --exists --print-errors "
- 		libecal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedata-cal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED
--    		evolution-plugin-$EVOLUTION_PACKAGE >= $EVOLUTION_REQUIRED
-+    		evolution-plugin >= $EVOLUTION_REQUIRED
-     ") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -25670,7 +25670,7 @@
- 		libecal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedata-cal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED
--    		evolution-plugin-$EVOLUTION_PACKAGE >= $EVOLUTION_REQUIRED
-+    		evolution-plugin >= $EVOLUTION_REQUIRED
-     " 2>/dev/null`
- else
-   pkg_failed=yes
-@@ -25688,13 +25688,13 @@
- 		libecal-\$EDS_PACKAGE >= \$EDS_REQUIRED
-     		libedata-cal-\$EDS_PACKAGE >= \$EDS_REQUIRED
-     		libedataserver-\$EDS_PACKAGE >= \$EDS_REQUIRED
--    		evolution-plugin-\$EVOLUTION_PACKAGE >= \$EVOLUTION_REQUIRED
-+    		evolution-plugin >= \$EVOLUTION_REQUIRED
-     \"") >&5
-   ($PKG_CONFIG --exists --print-errors "
- 		libecal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedata-cal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED
--    		evolution-plugin-$EVOLUTION_PACKAGE >= $EVOLUTION_REQUIRED
-+    		evolution-plugin >= $EVOLUTION_REQUIRED
-     ") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -25703,7 +25703,7 @@
- 		libecal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedata-cal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED
--    		evolution-plugin-$EVOLUTION_PACKAGE >= $EVOLUTION_REQUIRED
-+    		evolution-plugin >= $EVOLUTION_REQUIRED
-     " 2>/dev/null`
- else
-   pkg_failed=yes
-@@ -25727,14 +25727,14 @@
- 		libecal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedata-cal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED
--    		evolution-plugin-$EVOLUTION_PACKAGE >= $EVOLUTION_REQUIRED
-+    		evolution-plugin >= $EVOLUTION_REQUIRED
-     "`
-         else
- 	        EDS_BACKEND_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
- 		libecal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedata-cal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED
--    		evolution-plugin-$EVOLUTION_PACKAGE >= $EVOLUTION_REQUIRED
-+    		evolution-plugin >= $EVOLUTION_REQUIRED
-     "`
-         fi
- 	# Put the nasty error message in config.log where it belongs
-@@ -25744,7 +25744,7 @@
- 		libecal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedata-cal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED
--    		evolution-plugin-$EVOLUTION_PACKAGE >= $EVOLUTION_REQUIRED
-+    		evolution-plugin >= $EVOLUTION_REQUIRED
-     ) were not met:
- 
- $EDS_BACKEND_PKG_ERRORS
-@@ -25760,7 +25760,7 @@
- 		libecal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedata-cal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED
--    		evolution-plugin-$EVOLUTION_PACKAGE >= $EVOLUTION_REQUIRED
-+    		evolution-plugin >= $EVOLUTION_REQUIRED
-     ) were not met:
- 
- $EDS_BACKEND_PKG_ERRORS
-@@ -25804,7 +25804,7 @@
- fi
-     extensiondir=`$PKG_CONFIG --variable=extensiondir evolution-data-server-$EDS_PACKAGE`
- 
--    plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-$EVOLUTION_PACKAGE`
-+    plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin`
- 
-     use_eds_backend=yes
- else
-diff -u -r planner-0.14.3/configure.in planner.mod/configure.in
---- planner-0.14.3/configure.in	2008-04-12 07:49:23.000000000 -0500
-+++ planner.mod/configure.in	2008-04-19 18:38:27.000000000 -0500
-@@ -289,11 +289,11 @@
- 		libecal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedata-cal-$EDS_PACKAGE >= $EDS_REQUIRED
-     		libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED
--    		evolution-plugin-$EVOLUTION_PACKAGE >= $EVOLUTION_REQUIRED
-+    		evolution-plugin >= $EVOLUTION_REQUIRED
-     ])
-     extensiondir=`$PKG_CONFIG --variable=extensiondir evolution-data-server-$EDS_PACKAGE`
-     AC_SUBST(extensiondir)
--    plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-$EVOLUTION_PACKAGE`
-+    plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin`
-     AC_SUBST(plugindir)
-     use_eds_backend=yes
- else
diff --git a/gnome2-libs/glib-networking/DETAILS b/gnome2-libs/glib-networking/DETAILS
index 8c563b4..6f4a070 100755
--- a/gnome2-libs/glib-networking/DETAILS
+++ b/gnome2-libs/glib-networking/DETAILS
@@ -1,7 +1,7 @@
            SPELL=glib-networking
-         VERSION=2.30.1
+         VERSION=2.30.2
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
-          SOURCE=$SPELL-$VERSION.tar.bz2
+          SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome2-libs/glib-networking/HISTORY b/gnome2-libs/glib-networking/HISTORY
index 5d4cd73..d70460d 100644
--- a/gnome2-libs/glib-networking/HISTORY
+++ b/gnome2-libs/glib-networking/HISTORY
@@ -1,3 +1,8 @@
+2012-01-10 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 2.30.2
+	  bz2 -> xz
+	* PRE_BUILD: added to handle xz archive
+
 2011-10-18 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.30.1
 
diff --git a/gnome2-libs/glib-networking/PRE_BUILD b/gnome2-libs/glib-networking/PRE_BUILD
new file mode 100755
index 0000000..8240c01
--- /dev/null
+++ b/gnome2-libs/glib-networking/PRE_BUILD
@@ -0,0 +1,5 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $BUILD_DIRECTORY &&
+verify_file '' &&
+xz -dc $SOURCE_CACHE/$SOURCE | tar -xf - &&
+cd $SOURCE_DIRECTORY
diff --git a/gnome2-libs/glib-networking/glib-networking-2.30.1.tar.bz2.sig b/gnome2-libs/glib-networking/glib-networking-2.30.1.tar.bz2.sig
deleted file mode 100644
index 12561a6..0000000
Binary files a/gnome2-libs/glib-networking/glib-networking-2.30.1.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/glib-networking/glib-networking-2.30.2.tar.xz.sig b/gnome2-libs/glib-networking/glib-networking-2.30.2.tar.xz.sig
new file mode 100644
index 0000000..98848ec
Binary files /dev/null and b/gnome2-libs/glib-networking/glib-networking-2.30.2.tar.xz.sig differ
diff --git a/gnome2-libs/glib2/DETAILS b/gnome2-libs/glib2/DETAILS
index 9134918..9ac3342 100755
--- a/gnome2-libs/glib2/DETAILS
+++ b/gnome2-libs/glib2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=glib2 
 if [[ $GLIB_VER == devel ]];then
-         VERSION=2.31.6
+         VERSION=2.31.8
           SOURCE=glib-$VERSION.tar.xz
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 else
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 8b8f0ee..0fdffe0 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,6 @@
+2012-01-11 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated devel to 2.31.8
+
 2011-12-22 Sukneet Basuta <sukneet at sourcemage.org>
 	* DETAILS:  updated devel to 2.31.6
 	  bz2 -> xz
diff --git a/gnome2-libs/glib2/glib-2.31.6.tar.xz.sig b/gnome2-libs/glib2/glib-2.31.6.tar.xz.sig
deleted file mode 100644
index 57d671f..0000000
Binary files a/gnome2-libs/glib2/glib-2.31.6.tar.xz.sig and /dev/null differ
diff --git a/gnome2-libs/glib2/glib-2.31.8.tar.xz.sig b/gnome2-libs/glib2/glib-2.31.8.tar.xz.sig
new file mode 100644
index 0000000..1bb62ab
Binary files /dev/null and b/gnome2-libs/glib2/glib-2.31.8.tar.xz.sig differ
diff --git a/gnome2-libs/gnome-nettool/DEPENDS b/gnome2-libs/gnome-nettool/DEPENDS
index 08b9c49..4e3eed9 100755
--- a/gnome2-libs/gnome-nettool/DEPENDS
+++ b/gnome2-libs/gnome-nettool/DEPENDS
@@ -1,4 +1,4 @@
-depends gtk+2            &&
+depends gtk+3            &&
 depends gconf2           &&
 depends gnome-doc-utils  &&
 
diff --git a/gnome2-libs/gnome-nettool/DETAILS b/gnome2-libs/gnome-nettool/DETAILS
index a79337a..6482016 100755
--- a/gnome2-libs/gnome-nettool/DETAILS
+++ b/gnome2-libs/gnome-nettool/DETAILS
@@ -1,7 +1,7 @@
            SPELL=gnome-nettool
-         VERSION=2.32.0
+         VERSION=3.0.1
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
-          SOURCE=$SPELL-$VERSION.tar.bz2
+          SOURCE=$SPELL-$VERSION.tar.xz
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-nettool/HISTORY b/gnome2-libs/gnome-nettool/HISTORY
index bd93b05..aead5fb 100644
--- a/gnome2-libs/gnome-nettool/HISTORY
+++ b/gnome2-libs/gnome-nettool/HISTORY
@@ -1,3 +1,9 @@
+2012-01-10 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 3.0.1
+	  bz2 -> xz
+	* DEPENDS: gtk+2 -> gtk+3
+	* PRE_BUILD: added to handle xz archive
+
 2010-09-30 Vasil Yonkov <spirtbrat at sourcemage.org>
 	* DETAILS: updated spell to 2.32.0
 
diff --git a/gnome2-libs/gnome-nettool/PRE_BUILD b/gnome2-libs/gnome-nettool/PRE_BUILD
new file mode 100755
index 0000000..8240c01
--- /dev/null
+++ b/gnome2-libs/gnome-nettool/PRE_BUILD
@@ -0,0 +1,5 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $BUILD_DIRECTORY &&
+verify_file '' &&
+xz -dc $SOURCE_CACHE/$SOURCE | tar -xf - &&
+cd $SOURCE_DIRECTORY
diff --git a/gnome2-libs/gnome-nettool/gnome-nettool-2.32.0.tar.bz2.sig b/gnome2-libs/gnome-nettool/gnome-nettool-2.32.0.tar.bz2.sig
deleted file mode 100644
index cc87bb2..0000000
Binary files a/gnome2-libs/gnome-nettool/gnome-nettool-2.32.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/gnome-nettool/gnome-nettool-3.0.1.tar.xz.sig b/gnome2-libs/gnome-nettool/gnome-nettool-3.0.1.tar.xz.sig
new file mode 100644
index 0000000..2336e60
Binary files /dev/null and b/gnome2-libs/gnome-nettool/gnome-nettool-3.0.1.tar.xz.sig differ
diff --git a/gnome2-libs/gtkhtml2/DETAILS b/gnome2-libs/gtkhtml2/DETAILS
index 87fbd2e..b89a1a1 100755
--- a/gnome2-libs/gtkhtml2/DETAILS
+++ b/gnome2-libs/gtkhtml2/DETAILS
@@ -1,7 +1,7 @@
            SPELL=gtkhtml2
-         VERSION=4.2.2
+         VERSION=4.2.3
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
-          SOURCE=gtkhtml-$VERSION.tar.bz2
+          SOURCE=gtkhtml-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gtkhtml-$VERSION
    SOURCE_URL[0]=$GNOME_URL/sources/gtkhtml/$BRANCH/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome2-libs/gtkhtml2/HISTORY b/gnome2-libs/gtkhtml2/HISTORY
index fea56e6..bd875da 100644
--- a/gnome2-libs/gtkhtml2/HISTORY
+++ b/gnome2-libs/gtkhtml2/HISTORY
@@ -1,3 +1,8 @@
+2012-01-11 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 4.2.3
+	  bz2 -> xz
+	* PRE_BUILD: added to handle xz archive
+
 2011-11-15 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 4.2.2
 	* DEPENDS: gtk2 -> gtk+3
diff --git a/gnome2-libs/gtkhtml2/PRE_BUILD b/gnome2-libs/gtkhtml2/PRE_BUILD
new file mode 100755
index 0000000..6f54504
--- /dev/null
+++ b/gnome2-libs/gtkhtml2/PRE_BUILD
@@ -0,0 +1,5 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $BUILD_DIRECTORY &&
+verify_file '' &&
+xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
+cd $SOURCE_DIRECTORY
diff --git a/gnome2-libs/gtkhtml2/gtkhtml-4.2.2.tar.bz2.sig b/gnome2-libs/gtkhtml2/gtkhtml-4.2.2.tar.bz2.sig
deleted file mode 100644
index b3bb5ca..0000000
Binary files a/gnome2-libs/gtkhtml2/gtkhtml-4.2.2.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/gtkhtml2/gtkhtml-4.2.3.tar.xz.sig b/gnome2-libs/gtkhtml2/gtkhtml-4.2.3.tar.xz.sig
new file mode 100644
index 0000000..2f7ace0
Binary files /dev/null and b/gnome2-libs/gtkhtml2/gtkhtml-4.2.3.tar.xz.sig differ
diff --git a/gnome3-libs/gnome-icon-theme-symbolic/DETAILS b/gnome3-libs/gnome-icon-theme-symbolic/DETAILS
index 45033c2..5794d29 100755
--- a/gnome3-libs/gnome-icon-theme-symbolic/DETAILS
+++ b/gnome3-libs/gnome-icon-theme-symbolic/DETAILS
@@ -1,7 +1,7 @@
            SPELL=gnome-icon-theme-symbolic
-         VERSION=3.2.1
+         VERSION=3.2.2
           BRANCH=${VERSION:0:3}
-          SOURCE=$SPELL-$VERSION.tar.bz2
+         SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
diff --git a/gnome3-libs/gnome-icon-theme-symbolic/HISTORY b/gnome3-libs/gnome-icon-theme-symbolic/HISTORY
index 428561e..c9803a7 100644
--- a/gnome3-libs/gnome-icon-theme-symbolic/HISTORY
+++ b/gnome3-libs/gnome-icon-theme-symbolic/HISTORY
@@ -1,3 +1,8 @@
+2012-01-11 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 3.2.2 
+	  bz2 -> xz
+	* PRE_BUILD: added to handle xz archive
+
 2011-10-20 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.2.1
 
diff --git a/gnome3-libs/gnome-icon-theme-symbolic/PRE_BUILD b/gnome3-libs/gnome-icon-theme-symbolic/PRE_BUILD
new file mode 100755
index 0000000..6f54504
--- /dev/null
+++ b/gnome3-libs/gnome-icon-theme-symbolic/PRE_BUILD
@@ -0,0 +1,5 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $BUILD_DIRECTORY &&
+verify_file '' &&
+xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
+cd $SOURCE_DIRECTORY
diff --git a/gnome3-libs/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.2.1.tar.bz2.sig b/gnome3-libs/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.2.1.tar.bz2.sig
deleted file mode 100644
index 337062c..0000000
Binary files a/gnome3-libs/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.2.1.tar.bz2.sig and /dev/null differ
diff --git a/gnome3-libs/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.2.2.tar.xz.sig b/gnome3-libs/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.2.2.tar.xz.sig
new file mode 100644
index 0000000..f4c54fa
Binary files /dev/null and b/gnome3-libs/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.2.2.tar.xz.sig differ
diff --git a/graphics/gimp/DEPENDS b/graphics/gimp/DEPENDS
index 84f6263..d74498c 100755
--- a/graphics/gimp/DEPENDS
+++ b/graphics/gimp/DEPENDS
@@ -50,7 +50,7 @@ optional_depends tiff \
                  "--without-libtiff" \
                  "for TIFF support" &&
 
-optional_depends jpeg \
+optional_depends JPEG \
                  "--with-libjpeg" \
                  "--without-libjpeg" \
                  "for JPEG support" &&
diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index 4e121ac..122b9c6 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-11 Arjan Bouter <abouter at sourcemage.org>
+	* DEPENDS: jpeg -> JPEG
+
 2011-12-25 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: renewed dependencies and flags
 
diff --git a/libs/ldns/BUILD b/libs/ldns/BUILD
index 8176113..541bf9a 100755
--- a/libs/ldns/BUILD
+++ b/libs/ldns/BUILD
@@ -1,12 +1,8 @@
-OPTS="$LDNS_OPTS $OPTS" &&
+OPTS="$LDNS_OPTS $LDNS_DRILL $LDNS_EXAMPLES $OPTS" &&
 
 default_build &&
 
 list_remove OPTS '--with-pyldns' &&
 list_remove OPTS '--without-pyldns' &&
 list_remove OPTS '--with-pyldnsx' &&
-list_remove OPTS '--without-pyldnsx' &&
-
-cd drill &&
-default_build &&
-cd ..
+list_remove OPTS '--without-pyldnsx'
diff --git a/libs/ldns/CONFIGURE b/libs/ldns/CONFIGURE
new file mode 100755
index 0000000..ad2ad73
--- /dev/null
+++ b/libs/ldns/CONFIGURE
@@ -0,0 +1,5 @@
+config_query_option LDNS_DRILL "Build and install drill?" n \
+                     "--with-drill" "--without-drill" &&
+
+config_query_option LDNS_EXAMPLES "Build and install examples?" n \
+                     "--with-examples" "--without-examples"
diff --git a/libs/ldns/DETAILS b/libs/ldns/DETAILS
index ae8331b..c02d877 100755
--- a/libs/ldns/DETAILS
+++ b/libs/ldns/DETAILS
@@ -1,9 +1,9 @@
            SPELL=ldns
-         VERSION=1.6.11
+         VERSION=1.6.12
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.nlnetlabs.nl/downloads/ldns/$SOURCE
-     SOURCE_HASH=sha512:be8453d4ce9e21e99950f28e66a72139321a320ba8629a4fcb5e00ccb241ca71deee331302a80785c2562cb93e4f3292d5051ff590c0192d1d514a335291a7b9
+     SOURCE_HASH=sha512:f928be35a5c0bc2b918f005dd592cc531451f373ed9d77a54d5207a2a80b9d525faabf75bba75483d3476cfeff75a66ad4d9527a84a983216dae4fac30213773
       LICENSE[0]=MIT
         WEB_SITE=http://www.nlnetlabs.nl/projects/ldns/
      GATHER_DOCS=off
diff --git a/libs/ldns/HISTORY b/libs/ldns/HISTORY
index a2a263c..f08107e 100644
--- a/libs/ldns/HISTORY
+++ b/libs/ldns/HISTORY
@@ -1,3 +1,8 @@
+2012-01-12 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.6.12
+	* CONFIGURE, BUILD: drill and examples are optional now
+	* INSTALL: removed
+
 2011-12-13 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: added optional dependency on openssl 1.0 for GOST support
 
diff --git a/libs/ldns/INSTALL b/libs/ldns/INSTALL
deleted file mode 100755
index dd89176..0000000
--- a/libs/ldns/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-default_install &&
-cd drill &&
-default_install
diff --git a/mail/alpine/DETAILS b/mail/alpine/DETAILS
index eb082a8..0eb2e54 100755
--- a/mail/alpine/DETAILS
+++ b/mail/alpine/DETAILS
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
       SOURCE_GPG=re-alpine.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 if [[ $ALPINE_TOPAL == y ]]; then
-        VERSION3=72
+        VERSION3=74
         SOURCE22=topal-package-$VERSION3.tgz
         SOURCE23=topal-package-$VERSION3.tgz.asc
  SOURCE22_URL[0]=http://homepage.ntlworld.com/phil.brooke/topal/rel-$VERSION3/$SOURCE22
diff --git a/mail/alpine/HISTORY b/mail/alpine/HISTORY
index b5c0ff0..b9b430d 100644
--- a/mail/alpine/HISTORY
+++ b/mail/alpine/HISTORY
@@ -1,3 +1,6 @@
+2012-01-11 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DETAILS: update topal to 74
+
 2010-12-06 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* DEPENDS: pass the path
 
diff --git a/net/whois/DETAILS b/net/whois/DETAILS
index f3a9544..5ef3dd2 100755
--- a/net/whois/DETAILS
+++ b/net/whois/DETAILS
@@ -1,9 +1,9 @@
            SPELL=whois
-         VERSION=5.0.13
+         VERSION=5.0.14
           SOURCE=${SPELL}_$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/w/whois/$SOURCE
-     SOURCE_HASH=sha512:2885e4397f477649be586920e7650989116b1d04fcfd2442ae33691f5d2640b67d5f898ba66ef8e58f2c40f0e3bb55a241839f3d048a547b93ef3083cd8ade01
+     SOURCE_HASH=sha512:79a9453cebeb6df293e7c708c8d5e199161070e2ad54df89d4991c1d48d0a9a8b384c7850797aec30339e310ed2c49ba5b720d3ebc9a652541b040991caa55b3
         WEB_SITE=http://www.linux.it/~md/software/
          ENTERED=20011228
       LICENSE[0]=GPL
diff --git a/net/whois/HISTORY b/net/whois/HISTORY
index 48715bf..254cbf4 100644
--- a/net/whois/HISTORY
+++ b/net/whois/HISTORY
@@ -1,3 +1,6 @@
+2012-01-11 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: updated spell to 5.0.14
+
 2011-12-06 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 5.0.13
 
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index 78cab64..08e4196 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
            SPELL=wireshark
-         VERSION=1.6.4
-  SECURITY_PATCH=33
+         VERSION=1.6.5
+  SECURITY_PATCH=34
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
    SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-     SOURCE_HASH=sha512:544d88e680395dd622925a6c0e185f23a6e55416d887a797e91787adc4f363fa7b32428fdc94c1f76920ac9236a7a641619dfb204f1dbb34590331431e989ebb
+     SOURCE_HASH=sha512:67c12d6853219f3c57c7946ffb98697639e9e40fc4c0b9dc27ca50b301fb40cb74c08d31cc35b1120cbb0315f1ddcce47d82ae2dec9733a764614090c76df0f3
         WEB_SITE=http://www.wireshark.org/
          ENTERED=20020116
       LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index 949754d..7ef555b 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,7 @@
+2012-01-11 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.6.5, SECURITY_PATCH=34
+	* PRE_BUILD, dumpcap.patch: removed
+
 2011-12-17 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: lua -> lua51
 
diff --git a/security/wireshark/PRE_BUILD b/security/wireshark/PRE_BUILD
deleted file mode 100755
index 4b11f80..0000000
--- a/security/wireshark/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/dumpcap.patch"
diff --git a/security/wireshark/dumpcap.patch b/security/wireshark/dumpcap.patch
deleted file mode 100644
index e967e43..0000000
--- a/security/wireshark/dumpcap.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dumpcap.c.orig	2011-11-18 23:14:44.000000000 +0400
-+++ dumpcap.c	2011-11-19 18:44:22.406486465 +0400
-@@ -2488,9 +2488,7 @@
-     int       inpkts;
-     gint      packet_count_before;
-     guchar    pcap_data[WTAP_MAX_PACKET_SIZE];
--#ifndef USE_THREADS
-     int       sel_ret;
--#endif
- 
-     packet_count_before = ld->packet_count;
-     if (ld->from_cap_pipe) {


More information about the SM-Commit mailing list