diff --git
a/gnome2-libs/gnome-control-center/gnome-control-center-3.4.0.tar.xz.sig
b/gnome2-libs/gnome-control-center/gnome-control-center-3.4.0.tar.xz.sig
deleted file mode 100644
index 3f4a9d5..0000000
Binary files
a/gnome2-libs/gnome-control-center/gnome-control-center-3.4.0.tar.xz.sig and
/dev/null differ
diff --git
a/gnome2-libs/gnome-control-center/gnome-control-center-3.4.1.tar.xz.sig
b/gnome2-libs/gnome-control-center/gnome-control-center-3.4.1.tar.xz.sig
new file mode 100644
index 0000000..d196cc0
Binary files /dev/null and
b/gnome2-libs/gnome-control-center/gnome-control-center-3.4.1.tar.xz.sig
differ
diff --git a/gnome2-libs/gnome-session/DETAILS
b/gnome2-libs/gnome-session/DETAILS
index e6316c4..2117fd8 100755
--- a/gnome2-libs/gnome-session/DETAILS
+++ b/gnome2-libs/gnome-session/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-session
- VERSION=3.4.0
+ VERSION=3.4.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-session/HISTORY
b/gnome2-libs/gnome-session/HISTORY
index d4fa8f5..d4ea169 100644
--- a/gnome2-libs/gnome-session/HISTORY
+++ b/gnome2-libs/gnome-session/HISTORY
@@ -1,3 +1,6 @@
+2012-04-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.4.1
+
2012-03-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.4.0
diff --git a/gnome2-libs/gnome-session/gnome-session-3.4.0.tar.xz.sig
b/gnome2-libs/gnome-session/gnome-session-3.4.0.tar.xz.sig
deleted file mode 100644
index f7ee783..0000000
Binary files a/gnome2-libs/gnome-session/gnome-session-3.4.0.tar.xz.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-session/gnome-session-3.4.1.tar.xz.sig
b/gnome2-libs/gnome-session/gnome-session-3.4.1.tar.xz.sig
new file mode 100644
index 0000000..62f450a
Binary files /dev/null and
b/gnome2-libs/gnome-session/gnome-session-3.4.1.tar.xz.sig differ
diff --git a/gnome2-libs/gtkhtml2/DETAILS b/gnome2-libs/gtkhtml2/DETAILS
index 4d2a1cd..fecdcde 100755
--- a/gnome2-libs/gtkhtml2/DETAILS
+++ b/gnome2-libs/gtkhtml2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gtkhtml2
- VERSION=4.4.0
+ VERSION=4.4.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gtkhtml-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gtkhtml-$VERSION
diff --git a/gnome2-libs/gtkhtml2/HISTORY b/gnome2-libs/gtkhtml2/HISTORY
index 33751d8..07bee6b 100644
--- a/gnome2-libs/gtkhtml2/HISTORY
+++ b/gnome2-libs/gtkhtml2/HISTORY
@@ -1,3 +1,6 @@
+2012-04-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.4.1
+
2012-03-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.4.0
* PRE_BUILD: removed
diff --git a/gnome2-libs/gtkhtml2/gtkhtml-4.4.0.tar.xz.sig
b/gnome2-libs/gtkhtml2/gtkhtml-4.4.0.tar.xz.sig
deleted file mode 100644
index d65c138..0000000
Binary files a/gnome2-libs/gtkhtml2/gtkhtml-4.4.0.tar.xz.sig and /dev/null
differ
diff --git a/gnome2-libs/gtkhtml2/gtkhtml-4.4.1.tar.xz.sig
b/gnome2-libs/gtkhtml2/gtkhtml-4.4.1.tar.xz.sig
new file mode 100644
index 0000000..80212ac
Binary files /dev/null and b/gnome2-libs/gtkhtml2/gtkhtml-4.4.1.tar.xz.sig
differ
diff --git a/gnome2-libs/gvfs/DETAILS b/gnome2-libs/gvfs/DETAILS
index 0de0a1d..8246d9a 100755
--- a/gnome2-libs/gvfs/DETAILS
+++ b/gnome2-libs/gvfs/DETAILS
@@ -1,5 +1,5 @@
SPELL=gvfs
- VERSION=1.12.0
+ VERSION=1.12.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/gvfs/HISTORY b/gnome2-libs/gvfs/HISTORY
index 8dbbe4b..7511789 100644
--- a/gnome2-libs/gvfs/HISTORY
+++ b/gnome2-libs/gvfs/HISTORY
@@ -1,3 +1,6 @@
+2012-04-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.12.1
+
2012-03-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.12.0
diff --git a/gnome2-libs/gvfs/gvfs-1.12.0.tar.xz.sig
b/gnome2-libs/gvfs/gvfs-1.12.0.tar.xz.sig
deleted file mode 100644
index 7f9538f..0000000
Binary files a/gnome2-libs/gvfs/gvfs-1.12.0.tar.xz.sig and /dev/null differ
diff --git a/gnome2-libs/gvfs/gvfs-1.12.1.tar.xz.sig
b/gnome2-libs/gvfs/gvfs-1.12.1.tar.xz.sig
new file mode 100644
index 0000000..f1a67cf
Binary files /dev/null and b/gnome2-libs/gvfs/gvfs-1.12.1.tar.xz.sig differ
diff --git a/gnome3-libs/gcr/DETAILS b/gnome3-libs/gcr/DETAILS
index 5078fb9..7916f5b 100755
--- a/gnome3-libs/gcr/DETAILS
+++ b/gnome3-libs/gcr/DETAILS
@@ -1,5 +1,5 @@
SPELL=gcr
- VERSION=3.4.0
+ VERSION=3.4.1
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome3-libs/gcr/HISTORY b/gnome3-libs/gcr/HISTORY
index b09349d..82bffa7 100644
--- a/gnome3-libs/gcr/HISTORY
+++ b/gnome3-libs/gcr/HISTORY
@@ -1,2 +1,5 @@
+2012-04-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.4.1
+
2012-03-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: spell created, version 3.4.0
diff --git a/gnome3-libs/gcr/gcr-3.4.0.tar.xz.sig
b/gnome3-libs/gcr/gcr-3.4.0.tar.xz.sig
deleted file mode 100644
index 3d44b84..0000000
Binary files a/gnome3-libs/gcr/gcr-3.4.0.tar.xz.sig and /dev/null differ
diff --git a/gnome3-libs/gcr/gcr-3.4.1.tar.xz.sig
b/gnome3-libs/gcr/gcr-3.4.1.tar.xz.sig
new file mode 100644
index 0000000..4c5ff6b
Binary files /dev/null and b/gnome3-libs/gcr/gcr-3.4.1.tar.xz.sig differ
diff --git a/graphics-libs/poppler/BUILD b/graphics-libs/poppler/BUILD
index eceb7a1..373e13c 100755
--- a/graphics-libs/poppler/BUILD
+++ b/graphics-libs/poppler/BUILD
@@ -1,5 +1,10 @@
OPTS="$POPPLER_OPTS $OPTS" &&
+# fixing issue #382
+if is_depends_enabled $SPELL openjpeg; then
+ CXXFLAGS="$CXXFLAGS -I${INSTALL_ROOT}/usr/include/openjpeg-1.5"
+fi &&
+
# -lm fixes the ./configure problem (http://www.sourcemage.org/issues/15)
LDFLAGS="-lm $LDFLAGS" &&
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 563ba77..d61c770 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,7 @@
+2012-04-16 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * BUILD: added path to openjpeg headers if dependency is enabled
+ (fixing #382)
+
2012-02-19 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.18.4
diff --git a/kde4-look/oxygen-gtk/BUILD b/kde4-look/oxygen-gtk/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/kde4-look/oxygen-gtk/BUILD
@@ -0,0 +1 @@
+true
diff --git a/kde4-look/oxygen-gtk/DEPENDS b/kde4-look/oxygen-gtk/DEPENDS
index 3d8bb9d..310e593 100755
--- a/kde4-look/oxygen-gtk/DEPENDS
+++ b/kde4-look/oxygen-gtk/DEPENDS
@@ -1,2 +1 @@
-depends gtk+2 &&
-depends cmake
+depends oxygen-gtk2
diff --git a/kde4-look/oxygen-gtk/DETAILS b/kde4-look/oxygen-gtk/DETAILS
index 0f0a39b..b35ba78 100755
--- a/kde4-look/oxygen-gtk/DETAILS
+++ b/kde4-look/oxygen-gtk/DETAILS
@@ -1,23 +1,7 @@
- SPELL=oxygen-gtk
- VERSION=1.1.6
- SOURCE=${SPELL}-${VERSION}.tar.bz2
- SOURCE_URL[0]=$KDE_URL/stable/${SPELL}/${VERSION}/src/${SOURCE}
-
SOURCE_HASH=sha512:cedc372e2b6d02990c21925721ca6a1cb0043953fb25a9c23e769f961de92370659c7822ccf09c386df717592e28e44f073d6a926b8148200b2462d66ef99b56
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://kde-look.org/content/show.php/?content=136216"
- LICENSE[0]=LGPL
- ENTERED=20111209
- SHORT="a port of the default KDE widget theme (Oxygen), to gtk"
-cat << EOF
-Oxygen-Gtk is a port of the default KDE widget theme (Oxygen), to gtk.
-
-Its primary goal is to ensure visual consistency between gtk and qt-based
-applications running under kde. A secondary objective is to also have a
-stand-alone nice looking gtk theme that would behave well on other Desktop
-Environments.
-
-Unlike other attempts made to port the kde oxygen theme to gtk, this attempt
-does not depend on Qt (via some Qt to Gtk conversion engine), nor does render
-the widget appearance via hard coded pixmaps, which otherwise breaks
everytime
-some setting is changed in kde.
-EOF
+ SPELL=oxygen-gtk
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by oxygen-gtk2]
+ EOF
diff --git a/kde4-look/oxygen-gtk/DOWNLOAD b/kde4-look/oxygen-gtk/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/kde4-look/oxygen-gtk/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/kde4-look/oxygen-gtk/HISTORY b/kde4-look/oxygen-gtk/HISTORY
index 5fbe609..d0ff91b 100644
--- a/kde4-look/oxygen-gtk/HISTORY
+++ b/kde4-look/oxygen-gtk/HISTORY
@@ -1,3 +1,8 @@
+2012-04-16 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * spell deprecated [renamed to oxygen-gtk2]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2012-01-03 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 1.1.6
diff --git a/kde4-look/oxygen-gtk/INSTALL b/kde4-look/oxygen-gtk/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/kde4-look/oxygen-gtk/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/kde4-look/oxygen-gtk/PRE_BUILD b/kde4-look/oxygen-gtk/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/kde4-look/oxygen-gtk/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/kde4-look/oxygen-gtk/TRIGGERS b/kde4-look/oxygen-gtk/TRIGGERS
new file mode 100755
index 0000000..a2ca897
--- /dev/null
+++ b/kde4-look/oxygen-gtk/TRIGGERS
@@ -0,0 +1 @@
+on_cast oxygen-gtk dispel_self
diff --git a/kde4-look/oxygen-gtk2/CONFLICTS b/kde4-look/oxygen-gtk2/CONFLICTS
new file mode 100755
index 0000000..bf80f0b
--- /dev/null
+++ b/kde4-look/oxygen-gtk2/CONFLICTS
@@ -0,0 +1 @@
+conflicts oxygen-gtk y
diff --git a/kde4-look/oxygen-gtk2/DEPENDS b/kde4-look/oxygen-gtk2/DEPENDS
new file mode 100755
index 0000000..3d8bb9d
--- /dev/null
+++ b/kde4-look/oxygen-gtk2/DEPENDS
@@ -0,0 +1,2 @@
+depends gtk+2 &&
+depends cmake
diff --git a/kde4-look/oxygen-gtk2/DETAILS b/kde4-look/oxygen-gtk2/DETAILS
new file mode 100755
index 0000000..81cddda
--- /dev/null
+++ b/kde4-look/oxygen-gtk2/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=oxygen-gtk2
+ VERSION=1.2.3
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+ SOURCE_URL[0]=$KDE_URL/stable/${SPELL}/${VERSION}/src/${SOURCE}
+
SOURCE_HASH=sha512:6f175d63f7359423aad2f82953c28fe7673e77737ba277d69583efaee5c752a88fb4246a517262436a89aa3a707917cd7b3f0a6aed0dd63238e9872e2002fe2d
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://kde-look.org/content/show.php/?content=136216"
+ LICENSE[0]=LGPL
+ ENTERED=20120416
+ SHORT="a port of the default KDE widget theme (Oxygen), to gtk"
+cat << EOF
+Oxygen-Gtk is a port of the default KDE widget theme (Oxygen), to gtk.
+
+Its primary goal is to ensure visual consistency between gtk and qt-based
+applications running under kde. A secondary objective is to also have a
+stand-alone nice looking gtk theme that would behave well on other Desktop
+Environments.
+
+Unlike other attempts made to port the kde oxygen theme to gtk, this attempt
+does not depend on Qt (via some Qt to Gtk conversion engine), nor does render
+the widget appearance via hard coded pixmaps, which otherwise breaks
everytime
+some setting is changed in kde.
+EOF
diff --git a/kde4-look/oxygen-gtk2/HISTORY b/kde4-look/oxygen-gtk2/HISTORY
new file mode 100644
index 0000000..404cc96
--- /dev/null
+++ b/kde4-look/oxygen-gtk2/HISTORY
@@ -0,0 +1,3 @@
+2012-04-16 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * CONFLICTS, DEPENDS, DETAILS, HISTORY: spell created
+
diff --git a/kde4-look/oxygen-gtk3/DEPENDS b/kde4-look/oxygen-gtk3/DEPENDS
new file mode 100755
index 0000000..0eafdc3
--- /dev/null
+++ b/kde4-look/oxygen-gtk3/DEPENDS
@@ -0,0 +1,2 @@
+depends cmake &&
+depends gtk+3
diff --git a/kde4-look/oxygen-gtk3/DETAILS b/kde4-look/oxygen-gtk3/DETAILS
new file mode 100755
index 0000000..121aa62
--- /dev/null
+++ b/kde4-look/oxygen-gtk3/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=oxygen-gtk3
+ VERSION=1.0.3
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=$KDE_URL/stable/${SPELL}/${VERSION}/src/${SOURCE}
+
SOURCE_HASH=sha512:33e8f19762f5b64020ee8d7d0b5adf3c1f4a2b8fe276a179ef7b4f69462801b83e7d5d7060d47f446d15e790deb2c798dd239ea2617d5100321c009b6ac3e97b
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://kde-look.org/content/show.php/?content=136216"
+ LICENSE[0]=LGPL
+ ENTERED=20120416
+ SHORT="port of the default KDE widget theme (Oxygen), to gtk"
+cat << EOF
+Oxygen-Gtk is a port of the default KDE widget theme (Oxygen), to gtk.
+
+Its primary goal is to ensure visual consistency between gtk and qt-based
+applications running under kde. A secondary objective is to also have a
+stand-alone nice looking gtk theme that would behave well on other Desktop
+Environments.
+
+Unlike other attempts made to port the kde oxygen theme to gtk, this attempt
+does not depend on Qt (via some Qt to Gtk conversion engine), nor does render
+the widget appearance via hard coded pixmaps, which otherwise breaks
everytime
+some setting is changed in kde.
+EOF
diff --git a/kde4-look/oxygen-gtk3/HISTORY b/kde4-look/oxygen-gtk3/HISTORY
new file mode 100644
index 0000000..30f4eb3
--- /dev/null
+++ b/kde4-look/oxygen-gtk3/HISTORY
@@ -0,0 +1,3 @@
+2012-04-16 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DEPENDS, DETAILS, HISTORY: spell created
+
diff --git a/net/iptraf-ng/DETAILS b/net/iptraf-ng/DETAILS
index dc2d51c..fe08bdc 100755
--- a/net/iptraf-ng/DETAILS
+++ b/net/iptraf-ng/DETAILS
@@ -1,6 +1,6 @@
SPELL=iptraf-ng
- VERSION=1.0.2
-
SOURCE_HASH=sha512:8b9c8d58d8b866c8866b5a9d20ba3c380ca680eb76b5f7fc806b9b7286a3671b3fb85b8a052139e5b4dbee3b3ee666b39dd69d7689b8f9261940a9b3c75ec795
+ VERSION=1.1.1
+
SOURCE_HASH=sha512:7ca1ba2fd6d9f719d59dab831db34d2f53cb8e1d955a7533b2106308feaf58a4efd8902c3d3cdaddb8965284d36564be4d3306d15e430012a095a57ed86f8326
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://fedorahosted.org/iptraf-ng
diff --git a/net/iptraf-ng/HISTORY b/net/iptraf-ng/HISTORY
index 18f214b..70d3eeb 100644
--- a/net/iptraf-ng/HISTORY
+++ b/net/iptraf-ng/HISTORY
@@ -1,3 +1,7 @@
+2012-04-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.1
+ * PRE_BUILD: added, fix finding ncurses
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/net/iptraf-ng/PRE_BUILD b/net/iptraf-ng/PRE_BUILD
new file mode 100755
index 0000000..025faa2
--- /dev/null
+++ b/net/iptraf-ng/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i 's/5-c/w&/' configure
diff --git a/x11-toolkits/gtk+3/DETAILS b/x11-toolkits/gtk+3/DETAILS
index 3de74da..7b94611 100755
--- a/x11-toolkits/gtk+3/DETAILS
+++ b/x11-toolkits/gtk+3/DETAILS
@@ -1,10 +1,10 @@
SPELL=gtk+3
if [[ $GTK_VER == devel ]];then
- VERSION=3.4.0
+ VERSION=3.4.1
SOURCE=gtk+-$VERSION.tar.xz
SOURCE_GPG=gurus.gpg:$SOURCE.sig
else
- VERSION=3.4.0
+ VERSION=3.4.1
SOURCE=gtk+-$VERSION.tar.xz
SOURCE_GPG=gurus.gpg:$SOURCE.sig
fi
diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index 447c192..37b5465 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,3 +1,6 @@
+2012-04-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.4.1
+
2012-03-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.4.0
* PRE_BUILD: removed
diff --git a/x11-toolkits/gtk+3/gtk+-3.4.0.tar.xz.sig
b/x11-toolkits/gtk+3/gtk+-3.4.0.tar.xz.sig
deleted file mode 100644
index 845db97..0000000
Binary files a/x11-toolkits/gtk+3/gtk+-3.4.0.tar.xz.sig and /dev/null differ
diff --git a/x11-toolkits/gtk+3/gtk+-3.4.1.tar.xz.sig
b/x11-toolkits/gtk+3/gtk+-3.4.1.tar.xz.sig
new file mode 100644
index 0000000..2d18ffa
Binary files /dev/null and b/x11-toolkits/gtk+3/gtk+-3.4.1.tar.xz.sig differ
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (88980ef03346e263265a8a45a69fbb9eeb6c2ba0),
Eric Sandall, 04/16/2012