Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (589dbf5761a152f5653f7593d260d8aa2b27e87e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (589dbf5761a152f5653f7593d260d8aa2b27e87e)
  • Date: Thu, 27 Jun 2013 09:24:32 -0500

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

ChangeLog | 6
crypto/krb5/DETAILS | 6
crypto/krb5/HISTORY | 3
database/mongodb/HISTORY | 4
database/mongodb/PRE_BUILD | 2
database/mongodb/boost150.patch.gz |binary
dev/null |binary
disk/quota/DETAILS | 7
disk/quota/HISTORY | 3
e/imlib2/BUILD | 4
e/imlib2/CONFIGURE | 1
e/imlib2/DEPENDS | 8
e/imlib2/DETAILS | 2
e/imlib2/HISTORY | 9
e/imlib2/Imlib2.h.patch | 129 -
e/imlib2/PRE_BUILD | 6
e/imlib2/PRE_SUB_DEPENDS | 7
e/imlib2/REPAIR^all^PRE_SUB_DEPENDS | 7
e/imlib2/SUB_DEPENDS | 7
e/imlib2/TRIGGERS | 4
fonts-x11/dejavu-ttf/DETAILS | 3
fonts-x11/dejavu-ttf/HISTORY | 3
fonts-x11/terminus-font/DETAILS | 2
fonts-x11/terminus-font/HISTORY | 3
ftp/curl/DETAILS | 4
ftp/curl/HISTORY | 3
gnome2-libs/nautilus-dropbox/DEPENDS | 1
gnome2-libs/nautilus-dropbox/DETAILS | 2
gnome2-libs/nautilus-dropbox/HISTORY | 4
gnome2-libs/nautilus-dropbox/nautilus-dropbox-1.6.0.tar.bz2.sig |binary
gnome2-libs/nautilus2/000-gnome-desktop-3.8.patch | 155 +
gnome2-libs/nautilus2/001-do-not-use-NautilusDesktopBackground.patch | 74
gnome2-libs/nautilus2/002-add_receive_dropped_background_image.patch | 85
gnome2-libs/nautilus2/003-remove_gnome_bg_set_draw_background.patch | 22
gnome2-libs/nautilus2/DETAILS | 4
gnome2-libs/nautilus2/HISTORY | 12
gnome2-libs/nautilus2/PRE_BUILD | 8
gnome2-libs/nautilus2/nautilus-3.6.3.tar.xz.sig |binary
graphics/darktable/DETAILS | 4
graphics/darktable/HISTORY | 3
graphics/feh/DETAILS | 2
graphics/feh/HISTORY | 3
graphics/qiv/DEPENDS | 8
graphics/qiv/HISTORY | 4
graphics/qiv/PRE_BUILD | 4
graphics/qiv/qiv-2.2.4-as-needed.patch | 31
http/firefox/BUILD | 6
http/firefox/DEPENDS | 5
http/firefox/DETAILS | 7
http/firefox/HISTORY | 10
http/w3m/HISTORY | 3
http/w3m/PRE_BUILD | 3
http/w3m/gc72.patch | 13
kernels/linux/HISTORY | 4
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.83 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.50 | 5
mail/claws-mail-extra-plugins/BUILD | 7
mail/claws-mail-extra-plugins/CONFIGURE | 23
mail/claws-mail-extra-plugins/DETAILS | 13
mail/claws-mail-extra-plugins/HISTORY | 147 -
mail/claws-mail-extra-plugins/INSTALL | 8
mail/claws-mail-extra-plugins/PRE_BUILD | 1
mail/claws-mail-extra-plugins/UP_TRIGGERS | 2
mail/claws-mail/CONFLICTS | 1
mail/claws-mail/DETAILS | 5
mail/claws-mail/HISTORY | 6
mail/greylist/DETAILS | 1
mail/greylist/HISTORY | 5
mail/greylist/PRE_BUILD | 3
mail/greylist/collect.patch | 23
net/iptables/DETAILS | 2
net/iptables/HISTORY | 3
python-pypi/fdb/DETAILS | 4
python-pypi/fdb/HISTORY | 3
shell-term-fm/rdesktop/DETAILS | 2
shell-term-fm/rdesktop/HISTORY | 3
utils/sudo/BUILD | 9
utils/sudo/HISTORY | 3
utils/xen/DETAILS | 4
utils/xen/HISTORY | 5
utils/xen/PRE_BUILD | 7
utils/xen/xsa-27-1.patch | 12
utils/xen/xsa-33.patch | 21
utils/xen/xsa-36.patch | 369
---
utils/xen/xsa-38.patch | 73
utils/xen/xsa-41-1.patch | 41
utils/xen/xsa-41.patch | 46
video-libs/libdc1394/DETAILS | 5
video-libs/libdc1394/HISTORY | 3
video-libs/libraw1394/DETAILS | 6
video-libs/libraw1394/HISTORY | 3
x11-toolkits/lesstif/CONFLICTS | 1
x11-toolkits/motif/BUILD | 2
x11-toolkits/motif/CONFIGURE | 7
x11-toolkits/motif/CONFLICTS | 2
x11-toolkits/motif/DEPENDS | 21
x11-toolkits/motif/DETAILS | 13
x11-toolkits/motif/HISTORY | 3
x11-toolkits/motif/PRE_BUILD | 9
x11-toolkits/motif/PROVIDES | 1
x11-toolkits/motif/UP_TRIGGERS | 14
x11-toolkits/motif/motif-autotools.patch | 1137
++++++++++
102 files changed, 1845 insertions(+), 954 deletions(-)

New commits:
commit ed131ce127cfe2a7080576e6bf46b4ffa8dfded9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

firefox: Remove gnome-vfs2 support (broken)
See https://bugzilla.mozilla.org/show_bug.cgi?id=799458, gnome-vfs
support is disabled by default. They say it works, but the last few
firefox releases it has not worked for me.

firefox with gnome-vfs2 enabled:
Error:

/usr/src/firefox-22.0/mozilla-release/firefox-build/browser/installer/package-manifest:305:
Missing file(s): bin/components/libnkgnomevfs.so
Traceback (most recent call last):
File

"/usr/src/firefox-22.0/mozilla-release/toolkit/mozapps/installer/packager.py",
line 374, in <module>
main()
File

"/usr/src/firefox-22.0/mozilla-release/toolkit/mozapps/installer/packager.py",
line 327, in main
copier.add(mozpack.path.join(binpath, 'removed-files'), removals)
File "/usr/lib/python2.7/contextlib.py", line 24, in __exit__
self.gen.next()
File
"/usr/src/firefox-22.0/mozilla-release/python/mozbuild/mozpack/errors.py",
line 129, in accumulate
raise AccumulatedErrors()
mozpack.errors.AccumulatedErrors
make[2]: *** [stage-package] Error 1
make[2]: Leaving directory
`/usr/src/firefox-22.0/mozilla-release/firefox-build/browser/installer'

commit 4edd2fa4c72376290e311a494d8f16e34db92157
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/darktable: version 1.2.2

commit f3da855c3862086e1776f6c278d6d3780da69a63
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

greylist: fixed collecting triplets (init mode support)

commit 6205be54f1764764c8764a909f9555ecbfa1c565
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

fdb: => 1.4

commit 622e27ecffd643d74760cb66896ed8b0583e8f39
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/firefox: version 22.0

commit c92092de06c5a357015e6caa2f3b70f47df8f9c2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mongodb: fixed build with boost 1.50+

commit efccb4483a2be35254c74fd5ad323bafb4bd5510
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.0.83 (lts)
(cherry picked from commit 4373e294029fc81d666ba3e432f19e99f881bcf6)

commit 29c400ddf746a60f72c8a0fafe88b756963ebe9b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.4.50 (lts)
(cherry picked from commit ffccaa7de604cfe286ad5f4f3d200337834be860)

commit 77cae0a41d0f6ca52610d0f79a21f8eb94e92385
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

curl: => 7.31.0 (security)

commit cc08fe1d8ccc4282a8d425c11c0916446e475ac3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xen: => 4.1.5 (security)

commit 889e98f9ea300fbf87149567949e48fd1d4bba1a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

krb5: => 1.11.3 (security)

commit 32fcb6c05555cc347d5c0386c302917f1060f73e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

nautilus-dropbox: Updated to 1.6.0

commit d63577adadc8d2a3abd6089461482fce4658ab25
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

nautilus-dropbox: Depends on pygtk2

checking for pygtk... no
configure: error: couldn't find pygtk

commit d20458e4d43976c502c4adcd8eb155def5452bdc
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

nautilus2: Updated to 3.6.3
SOURCE matches upstream posted SHA256

commit ccde31b5b32ae7d618006af099726729e9b2e3e1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

nautilus2: Fix compilation with gnome-desktop3 3.8+ and libgnome API 3.8
Apply 000-gnome-desktop-3.8.patch,
001-do-not-use-NautilusDesktopBackground.patch,
002-add_receive_dropped_background_image.patch, and
003-remove_gnome_bg_set_draw_background.patch.
gnome-desktop-3.8.patch borrowed from

http://git.pld-linux.org/gitweb.cgi/packages/gnome-panel.git/commitdiff/fd33e2e0d0dd96ab56e3ee8b297e7de83556c0e0

commit 8830b72522245a92a156d7531353c37966b9ab3b
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

quota: 4.01

commit 105feaf6af29fc9a4d174fa0a5ed628eb415db09
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

rdesktop: proper download link

commit 46339937e3ef78c8f58576ce3108514ad189f3a9
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

terminus-font: proper download link

commit 997dcb3b60d39e20527081dce41eb2f38a48b7da
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

dejavu-ttf: proper download link

commit b4d0922ce7a232b54384a95a758cd0e4e53ac4eb
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

iptables: 1.4.19.1

commit 0c0ebde842c485264435ba80d626c060ab38dab6
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

w3m: fix build failure with recent libgc

commit e5c365872b3be0bbdecb43917d423129528a8c4e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libdc1394: => 2.2.1

commit 4c471932855b69b5e58ab0aee4def86bccbc7026
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libraw1394: => 2.1.0

commit 07cbc4470da546c261c405bde53e5eb6ee445e39
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

sudo: fix BUILD for case when no editor selected

commit d4ca7a17da4545f2e5157e6ccf4e89dae1c339b7
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

feh 2.9.3

commit dc03aa1d62b240bfb1c06a6c506fcd20ad9197ed
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

claws-mail-extra-plugins deprecated, part of claws-mail now

commit 960bc768cac6446a296069cc4dd839d6739a4c01
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

claws-mail conflicts with claws-mail-extra-plugins, part of claws-mail
since 3.9.1

commit cdfc7c82bec462b575400ad3bfe91be22cd37dcc
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

qiv: Fix build for as-needed, X11 subdep on imlib2

commit 3573cc86e1de5e742174f1676e7ef12e978fbb95
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

imlib2: cleanup and X11 sub depends added

commit c200284be74489747b5292b77e981504789bf0da
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

mail/claws-mail: version 3.9.2

commit 60b6fd18652528c1b27ac4be87451b8e5c9840d8
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

motif: new spell, motif is released under LPGL

diff --git a/ChangeLog b/ChangeLog
index b5fe43a..5a6dcd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-24 Ladislav Hagara <hgr AT vabo.cz>
+ * mail/claws-mail-extra-plugins: deprecated, part of claws-mail now
+
+2013-06-23 Remko van der Vossen <wich AT sourcemage.org>
+ * x11-toolskits/motif: new spell, motif is released under LPGL
+
2013-06-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* perl-cpan/strictures: new spell, turn on strictures and make all
warnings fatal
diff --git a/crypto/krb5/DETAILS b/crypto/krb5/DETAILS
index 9fd1267..c8964bd 100755
--- a/crypto/krb5/DETAILS
+++ b/crypto/krb5/DETAILS
@@ -1,6 +1,6 @@
SPELL=krb5
- VERSION=1.11.2
-
SOURCE_HASH=sha512:2db58530a98c4bdf9c6f797f3fb2881a3bdeda680804309f1f40e877a5a1c6e589021e1e0521b5a258626e5d04105ad0c01575b2104313b4b9592ee1ae8b8006
+ VERSION=1.11.3
+
SOURCE_HASH=sha512:4d4c5d5c3a495da141bca40fe73378db190ace8ed397b7bb8e38c53757e6df3ec55fa0eb5628f7c6204d1265f8451535e65c4ebd844821c64cdfd0c6e32468a5
VX=${VERSION%.?}
SOURCE=$SPELL-$VERSION-signed.tar
SOURCE_RAW=$SPELL-$VERSION.tar.gz
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://web.mit.edu/kerberos/www/
ENTERED=20020215

LICENSE[0]=http://web.mit.edu/kerberos/www/krb5-1.7/krb5-1.7/doc/krb5-install.html#Copyright
- SECURITY_PATCH=11
+ SECURITY_PATCH=12
KEYWORDS="security crypto"
SHORT="Kerberos 5 network security protocol"
cat << EOF
diff --git a/crypto/krb5/HISTORY b/crypto/krb5/HISTORY
index 3ab0f2d..42a2869 100644
--- a/crypto/krb5/HISTORY
+++ b/crypto/krb5/HISTORY
@@ -1,3 +1,6 @@
+2013-06-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.11.3; SECURITY_PATCH++ (CVE-2002-2443)
+
2013-06-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.11.2

diff --git a/database/mongodb/HISTORY b/database/mongodb/HISTORY
index 8766a41..2e6dc88 100644
--- a/database/mongodb/HISTORY
+++ b/database/mongodb/HISTORY
@@ -1,3 +1,7 @@
+2013-06-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply patch
+ * boost150.patch.gz: added, to fix build with boost 1.50+
+
2013-05-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.0.9; SECURITY_PATCH=1 (CVE-2013-1892)

diff --git a/database/mongodb/PRE_BUILD b/database/mongodb/PRE_BUILD
index 3888f4e..ff92c07 100755
--- a/database/mongodb/PRE_BUILD
+++ b/database/mongodb/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+zcat "$SPELL_DIRECTORY/boost150.patch.gz" | patch -p1 &&
+
sed -i "s:lib64:lib:g" SConstruct
diff --git a/database/mongodb/boost150.patch.gz
b/database/mongodb/boost150.patch.gz
new file mode 100644
index 0000000..24fbd28
Binary files /dev/null and b/database/mongodb/boost150.patch.gz differ
diff --git a/disk/quota/DETAILS b/disk/quota/DETAILS
index 4affdeb..ca333c3 100755
--- a/disk/quota/DETAILS
+++ b/disk/quota/DETAILS
@@ -1,10 +1,9 @@
SPELL=quota
- VERSION=4.00-pre1
+ VERSION=4.01
SOURCE=${SPELL}-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-tools
- SOURCE_URL[0]=$SOURCEFORGE_URL/linuxquota/$SOURCE
-#
SOURCE_HASH=sha512:396af0d9c4b79c3a8be66e3879eb9c67b2e028490ab714bec0980d8b7aeb5584ce3cc6037b88363206f3ef79c1300db7eb873de6ca8ee50d50cf4b19905a8344
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+
SOURCE_URL[0]=http://sourceforge.net/projects/linuxquota/files/quota-tools/$VERSION/$SOURCE/download
+
SOURCE_HASH=sha512:57f79efe7e538f3109d0e44e4f87388ec4e8134f34ba92a30acb5d223090e8fb0087dfc558a951facc7f9b4d2301b4e305b710576363c13f5e70b06c91194dda
LICENSE[0]=BSD
WEB_SITE=http://sourceforge.net/projects/linuxquota/
KEYWORDS="disk"
diff --git a/disk/quota/HISTORY b/disk/quota/HISTORY
index e80005f..7be0c02 100644
--- a/disk/quota/HISTORY
+++ b/disk/quota/HISTORY
@@ -1,3 +1,6 @@
+2013-06-24 Remko van der Vossen <wich AT sourcemage.org>
+ * DETIALS: 4.01
+
2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated to 4.00-pre1

diff --git a/disk/quota/quota-4.00-pre1.tar.gz.sig
b/disk/quota/quota-4.00-pre1.tar.gz.sig
deleted file mode 100644
index b54540f..0000000
Binary files a/disk/quota/quota-4.00-pre1.tar.gz.sig and /dev/null differ
diff --git a/e/imlib2/BUILD b/e/imlib2/BUILD
index b3b9881..7b82be6 100755
--- a/e/imlib2/BUILD
+++ b/e/imlib2/BUILD
@@ -1,7 +1,5 @@
if [[ $HOST == x86_64-* ]]; then
- OPTS="--disable-mmx $IMLIB2_X11 $OPTS"
-else
- OPTS="$IMLIB2_X11 $OPTS"
+ OPTS="--disable-mmx $OPTS"
fi &&

default_build
diff --git a/e/imlib2/CONFIGURE b/e/imlib2/CONFIGURE
deleted file mode 100755
index a770cab..0000000
--- a/e/imlib2/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query_option IMLIB2_X11 "Enable X11 support?" y "" "--without-x"
diff --git a/e/imlib2/DEPENDS b/e/imlib2/DEPENDS
index 14b575f..6bb0bb4 100755
--- a/e/imlib2/DEPENDS
+++ b/e/imlib2/DEPENDS
@@ -1,8 +1,12 @@
depends libtool &&
depends freetype2 &&

-if [[ -z $IMLIB2_X11 ]]; then
- depends libx11
+optional_depends libx11 \
+ '--with-x' \
+ '--without-x' \
+ 'X11 support' &&
+
+if is_depends_enabled $SPELL libx11; then
depends libxext
fi &&

diff --git a/e/imlib2/DETAILS b/e/imlib2/DETAILS
index 0fcb406..5ce64a3 100755
--- a/e/imlib2/DETAILS
+++ b/e/imlib2/DETAILS
@@ -2,7 +2,7 @@
VERSION=1.4.5
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE
+
SOURCE_URL[0]=http://sourceforge.net/projects/enlightenment/files/imlib2-src/$VERSION/$SOURCE/download

SOURCE_HASH=sha512:6c3bceec39ffcb7515925c3eb4199834295732a1cc9cfa307aa8610e2565e770edfc5464ca983d1d95570bd9bac09c989e0751fa39b07cf794c0c5dce4262edf
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%-*}"
WEB_SITE=http://sourceforge.net/projects/enlightenment/files/
diff --git a/e/imlib2/HISTORY b/e/imlib2/HISTORY
index 27adac9..d0a26e0 100644
--- a/e/imlib2/HISTORY
+++ b/e/imlib2/HISTORY
@@ -1,3 +1,12 @@
+2013-06-23 Remko van der Vossen <wich AT sourcemage.org>
+ * BUILD, CONFIGURE, DEPENDS: make X a proper optiona depends
+ * PRE_BUILD, Imlib2.h.patch: patch not needed anymore, --without-x is
+ handled properly now
+ * PRE_SUB_DEPENDS, SUB_DEPENDS, REPAIR^all^PRE_SUB_DEPENDS: expose X11
+ sub
depends
+ * DETAILS: use new sourceforge url
+ * TRIGGERS: only set on_cast if zlib depend is enabled
+
2012-12-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: updated WEB_SITE

diff --git a/e/imlib2/Imlib2.h.patch b/e/imlib2/Imlib2.h.patch
deleted file mode 100644
index 9dcbd8d..0000000
--- a/e/imlib2/Imlib2.h.patch
+++ /dev/null
@@ -1,129 +0,0 @@
---- ./src/lib/Imlib2.h 2008-08-17 05:39:12.000000000 -0400
-+++ ./src/lib/Imlib2.h 2009-05-22 01:01:51.000000000 -0400
-@@ -22,10 +22,6 @@
- # endif
- # endif
-
--# ifndef X_DISPLAY_MISSING
--# include <X11/Xlib.h>
--# endif
--
- /* Data types to use */
- # ifndef DATA64
- # define DATA64 unsigned long long
-@@ -129,14 +125,6 @@
- EAPI Imlib_Context imlib_context_get(void);
-
- /* context setting */
--# ifndef X_DISPLAY_MISSING
-- EAPI void imlib_context_set_display(Display * display);
-- EAPI void imlib_context_disconnect_display(void);
-- EAPI void imlib_context_set_visual(Visual * visual);
-- EAPI void imlib_context_set_colormap(Colormap colormap);
-- EAPI void imlib_context_set_drawable(Drawable drawable);
-- EAPI void imlib_context_set_mask(Pixmap mask);
--# endif
- EAPI void imlib_context_set_dither_mask(char dither_mask);
- EAPI void imlib_context_set_mask_alpha_threshold(int
mask_alpha_threshold);
- EAPI void imlib_context_set_anti_alias(char anti_alias);
-@@ -160,13 +148,6 @@
- EAPI void imlib_context_set_TTF_encoding(Imlib_TTF_Encoding encoding);
-
- /* context getting */
--# ifndef X_DISPLAY_MISSING
-- EAPI Display *imlib_context_get_display(void);
-- EAPI Visual *imlib_context_get_visual(void);
-- EAPI Colormap imlib_context_get_colormap(void);
-- EAPI Drawable imlib_context_get_drawable(void);
-- EAPI Pixmap imlib_context_get_mask(void);
--# endif
- EAPI char imlib_context_get_dither_mask(void);
- EAPI char imlib_context_get_anti_alias(void);
- EAPI int imlib_context_get_mask_alpha_threshold(void);
-@@ -194,11 +175,6 @@
- EAPI int imlib_get_color_usage(void);
- EAPI void imlib_set_color_usage(int max);
- EAPI void imlib_flush_loaders(void);
--# ifndef X_DISPLAY_MISSING
-- EAPI int imlib_get_visual_depth(Display * display, Visual * visual);
-- EAPI Visual *imlib_get_best_visual(Display * display, int screen,
-- int *depth_return);
--# endif
-
- EAPI Imlib_Image imlib_load_image(const char *file);
- EAPI Imlib_Image imlib_load_image_immediately(const char *file);
-@@ -233,24 +209,6 @@
- EAPI void imlib_image_query_pixel_cmya(int x, int y, int *cyan, int
*magenta, int *yellow, int *alpha);
-
- /* rendering functions */
--# ifndef X_DISPLAY_MISSING
-- EAPI void imlib_render_pixmaps_for_whole_image(Pixmap * pixmap_return,
-- Pixmap * mask_return);
-- EAPI void imlib_render_pixmaps_for_whole_image_at_size(Pixmap *
pixmap_return,
-- Pixmap *
mask_return,
-- int width, int
height);
-- EAPI void imlib_free_pixmap_and_mask(Pixmap pixmap);
-- EAPI void imlib_render_image_on_drawable(int x, int y);
-- EAPI void imlib_render_image_on_drawable_at_size(int x, int y, int width,
-- int height);
-- EAPI void imlib_render_image_part_on_drawable_at_size(int source_x,
-- int source_y,
-- int source_width,
-- int source_height,
int x,
-- int y, int width,
-- int height);
-- EAPI DATA32 imlib_render_get_pixel_color(void);
--# endif
- EAPI void imlib_blend_image_onto_image(Imlib_Image source_image,
- char merge_alpha, int source_x,
- int source_y, int source_width,
-@@ -264,27 +222,6 @@
- DATA32 * data);
- EAPI Imlib_Image imlib_create_image_using_copied_data(int width, int
height,
- DATA32 * data);
--# ifndef X_DISPLAY_MISSING
-- EAPI Imlib_Image imlib_create_image_from_drawable(Pixmap mask, int x,
int y,
-- int width, int height,
-- char need_to_grab_x);
-- EAPI Imlib_Image imlib_create_image_from_ximage(XImage *image, XImage
*mask, int x, int y,
-- int width, int height,
-- char need_to_grab_x);
-- EAPI Imlib_Image imlib_create_scaled_image_from_drawable(Pixmap mask,
-- int source_x,
-- int source_y,
-- int
source_width,
-- int
source_height,
-- int
destination_width,
-- int
destination_height,
-- char
need_to_grab_x,
-- char
--
get_mask_from_shape);
-- EAPI char imlib_copy_drawable_to_image(Pixmap mask, int x, int y, int
width,
-- int height, int destination_x,
-- int destination_y, char
need_to_grab_x);
--# endif
- EAPI Imlib_Image imlib_clone_image(void);
- EAPI Imlib_Image imlib_create_cropped_image(int x, int y, int width,
- int height);
-@@ -472,21 +409,6 @@
- int destination_y, int
h_angle_x,
- int h_angle_y, int
v_angle_x,
- int v_angle_y);
--# ifndef X_DISPLAY_MISSING
-- EAPI void imlib_render_image_on_drawable_skewed(int source_x, int
source_y,
-- int source_width,
-- int source_height,
-- int destination_x,
-- int destination_y,
-- int h_angle_x, int
h_angle_y,
-- int v_angle_x, int
v_angle_y);
-- EAPI void imlib_render_image_on_drawable_at_angle(int source_x, int
source_y,
-- int source_width,
-- int source_height,
-- int destination_x,
-- int destination_y,
-- int angle_x, int
angle_y);
--# endif
-
- /* image filters */
- EAPI void imlib_image_filter(void);
diff --git a/e/imlib2/PRE_BUILD b/e/imlib2/PRE_BUILD
deleted file mode 100755
index 0e20c0d..0000000
--- a/e/imlib2/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if [[ $IMLIB2_X11 == "--without-x" ]]; then
- patch -p0 < "$SCRIPT_DIRECTORY"/Imlib2.h.patch
-fi
diff --git a/e/imlib2/PRE_SUB_DEPENDS b/e/imlib2/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..73f3d38
--- /dev/null
+++ b/e/imlib2/PRE_SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ X11)
+ is_depends_enabled $SPELL libx11 &&
+ is_depends_enabled $SPELL libxext &&
+ return 0;;
+esac
+return 1
diff --git a/e/imlib2/REPAIR^all^PRE_SUB_DEPENDS
b/e/imlib2/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..73f3d38
--- /dev/null
+++ b/e/imlib2/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ X11)
+ is_depends_enabled $SPELL libx11 &&
+ is_depends_enabled $SPELL libxext &&
+ return 0;;
+esac
+return 1
diff --git a/e/imlib2/SUB_DEPENDS b/e/imlib2/SUB_DEPENDS
new file mode 100755
index 0000000..d90e31b
--- /dev/null
+++ b/e/imlib2/SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ X11) echo "X11 support requested: forcing libx11 & libxext dependency."
+ depends libx11 &&
+ depends libxext;;
+ *) echo "Bogus sub_depends: $THIS_SUB_DEPENDS"
+ return 1;;
+esac
diff --git a/e/imlib2/TRIGGERS b/e/imlib2/TRIGGERS
index c83574f..2bc04d1 100755
--- a/e/imlib2/TRIGGERS
+++ b/e/imlib2/TRIGGERS
@@ -1 +1,3 @@
-on_cast zlib cast_self
+if is_depends_enabled $SPELL zlib; then
+ on_cast zlib cast_self
+fi
diff --git a/fonts-x11/dejavu-ttf/DETAILS b/fonts-x11/dejavu-ttf/DETAILS
index 71e2269..4172190 100755
--- a/fonts-x11/dejavu-ttf/DETAILS
+++ b/fonts-x11/dejavu-ttf/DETAILS
@@ -1,11 +1,10 @@
SPELL=dejavu-ttf
SPELLX=dejavu-fonts-ttf
- PACKAGE=${SPELL%-*}
VERSION=2.33

SOURCE_HASH=sha512:67cb905c62f264267326f824be60c7a9f1d880ccc44b7ebc4acefe0f5ea4e89e82d3ad506e4cd588e8e070fe1418414b6be2dcde68f3be0f7f37d90ad4608376
SOURCE=$SPELLX-$VERSION.tar.bz2
DOCS="README LICENSE AUTHORS NEWS BUGS *.txt"
- SOURCE_URL[0]=$SOURCEFORGE_URL/$PACKAGE/$SOURCE
+
SOURCE_URL[0]=http://sourceforge.net/projects/dejavu/files/dejavu/$VERSION/$SOURCE/download
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-${VERSION%-*}"
WEB_SITE=http://dejavu.sourceforge.net/
LICENSE[0]="Freely Distributable"
diff --git a/fonts-x11/dejavu-ttf/HISTORY b/fonts-x11/dejavu-ttf/HISTORY
index 6698fb7..82f8f15 100644
--- a/fonts-x11/dejavu-ttf/HISTORY
+++ b/fonts-x11/dejavu-ttf/HISTORY
@@ -1,3 +1,6 @@
+2013-06-24 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: Proper download link
+
2011-03-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.33

diff --git a/fonts-x11/terminus-font/DETAILS b/fonts-x11/terminus-font/DETAILS
index c4f3c42..b743851 100755
--- a/fonts-x11/terminus-font/DETAILS
+++ b/fonts-x11/terminus-font/DETAILS
@@ -2,7 +2,7 @@
VERSION=4.38
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_URL[0]=http://sourceforge.net/projects/$SPELL/files/$SPELL-$VERSION/$SOURCE/download

SOURCE_HASH=sha512:e37e20852645b247dffedf37f864e1cdbe2a23287e7f5737d89289eef1058f9621ef8d6339045b1be9ef603237a855a9f295022b8117685a6840c1f260966fd5
WEB_SITE=http://terminus-font.sourceforge.net/
ENTERED=20050720
diff --git a/fonts-x11/terminus-font/HISTORY b/fonts-x11/terminus-font/HISTORY
index a6d0be8..4524e98 100644
--- a/fonts-x11/terminus-font/HISTORY
+++ b/fonts-x11/terminus-font/HISTORY
@@ -1,3 +1,6 @@
+2013-06-24 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: Proper download link
+
2013-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: install to /usr/share/fonts/X11/misc

diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index 9e118f3..ac32339 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,6 +1,6 @@
SPELL=curl
- VERSION=7.30.0
- SECURITY_PATCH=9
+ VERSION=7.31.0
+ SECURITY_PATCH=10
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 41b2ead..df11b5a 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2013-06-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 7.31.0; SECURITY_PATCH++ (CVE-2013-2174)
+
2013-05-10 Remko van der Vossen <wich AT sourcemage.org>
* BUILD: Remove all occurrences of -DPIC
Prefer pure bash solution over spawning grep
diff --git a/gnome2-libs/nautilus-dropbox/DEPENDS
b/gnome2-libs/nautilus-dropbox/DEPENDS
index 4a6ebd4..f96316c 100755
--- a/gnome2-libs/nautilus-dropbox/DEPENDS
+++ b/gnome2-libs/nautilus-dropbox/DEPENDS
@@ -1,4 +1,5 @@
depends docutils &&
depends nautilus2 &&
+depends pygtk2 &&

suggest_depends pygpgme '' '' 'to verify binary signatures'
diff --git a/gnome2-libs/nautilus-dropbox/DETAILS
b/gnome2-libs/nautilus-dropbox/DETAILS
index 4965aa5..941a253 100755
--- a/gnome2-libs/nautilus-dropbox/DETAILS
+++ b/gnome2-libs/nautilus-dropbox/DETAILS
@@ -1,5 +1,5 @@
SPELL=nautilus-dropbox
- VERSION=1.4.0
+ VERSION=1.6.0
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_URL[0]=http://linux.dropbox.com/packages/${SOURCE}
diff --git a/gnome2-libs/nautilus-dropbox/HISTORY
b/gnome2-libs/nautilus-dropbox/HISTORY
index 28887ca..c122a50 100644
--- a/gnome2-libs/nautilus-dropbox/HISTORY
+++ b/gnome2-libs/nautilus-dropbox/HISTORY
@@ -1,3 +1,7 @@
+2013-06-24 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.6.0
+ * DEPENDS: Depends on pygtk2
+
2012-07-11 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.4.0
* DEPENDS: Depends on docutils
diff --git a/gnome2-libs/nautilus-dropbox/nautilus-dropbox-1.4.0.tar.bz2.sig
b/gnome2-libs/nautilus-dropbox/nautilus-dropbox-1.4.0.tar.bz2.sig
deleted file mode 100644
index 7cabd08..0000000
Binary files
a/gnome2-libs/nautilus-dropbox/nautilus-dropbox-1.4.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/nautilus-dropbox/nautilus-dropbox-1.6.0.tar.bz2.sig
b/gnome2-libs/nautilus-dropbox/nautilus-dropbox-1.6.0.tar.bz2.sig
new file mode 100644
index 0000000..6d2b7f3
Binary files /dev/null and
b/gnome2-libs/nautilus-dropbox/nautilus-dropbox-1.6.0.tar.bz2.sig differ
diff --git a/gnome2-libs/nautilus2/000-gnome-desktop-3.8.patch
b/gnome2-libs/nautilus2/000-gnome-desktop-3.8.patch
new file mode 100644
index 0000000..28deba4
--- /dev/null
+++ b/gnome2-libs/nautilus2/000-gnome-desktop-3.8.patch
@@ -0,0 +1,155 @@
+diff -Naur nautilus-3.6.1.orig/eel/eel-gnome-extensions.c
nautilus-3.6.1/eel/eel-gnome-extensions.c
+--- nautilus-3.6.1.orig/eel/eel-gnome-extensions.c 2013-06-24
15:48:18.490246931 -0700
++++ nautilus-3.6.1/eel/eel-gnome-extensions.c 2013-06-24 16:19:53.829949278
-0700
+@@ -31,7 +31,6 @@
+ #include "eel-gnome-extensions.h"
+
+ #include <gtk/gtk.h>
+-#include <libgnome-desktop/gnome-desktop-utils.h>
+
+ /* Return a command string containing the path to a terminal on this
system. */
+
+@@ -89,6 +88,137 @@
+ return result;
+ }
+
++
++/**
++ * gnome_desktop_prepend_terminal_to_vector:
++ * @argc: a pointer to the vector size
++ * @argv: a pointer to the vector
++ *
++ * Description: Prepends a terminal (either the one configured as default
in
++ * the user's GNOME setup, or one of the common xterm emulators) to the
passed
++ * in vector, modifying it in the process. The vector should be allocated
with
++ * #g_malloc, as this will #g_free the original vector. Also all elements
must
++ * have been allocated separately. That is the standard glib/GNOME way of
++ * doing vectors however. If the integer that @argc points to is negative,
the
++ * size will first be computed. Also note that passing in pointers to a
vector
++ * that is empty, will just create a new vector for you.
++ **/
++static void
++gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv)
++{
++#ifndef G_OS_WIN32
++ char **real_argv;
++ int real_argc;
++ int i, j;
++ char **term_argv = NULL;
++ int term_argc = 0;
++ GSettings *settings;
++
++ gchar *terminal = NULL;
++
++ char **the_argv;
++
++ g_return_if_fail (argc != NULL);
++ g_return_if_fail (argv != NULL);
++
++ // _gnome_desktop_init_i18n ();
++
++ /* sanity */
++ if(*argv == NULL)
++ *argc = 0;
++
++ the_argv = *argv;
++
++ /* compute size if not given */
++ if (*argc < 0) {
++ for (i = 0; the_argv[i] != NULL; i++)
++ ;
++ *argc = i;
++ }
++
++ settings = g_settings_new
("org.gnome.desktop.default-applications.terminal");
++ terminal = g_settings_get_string (settings, "exec");
++
++ if (terminal) {
++ gchar *command_line;
++ gchar *exec_flag;
++
++ exec_flag = g_settings_get_string (settings, "exec-arg");
++
++ if (exec_flag == NULL)
++ command_line = g_strdup (terminal);
++ else
++ command_line = g_strdup_printf ("%s %s", terminal,
++ exec_flag);
++
++ g_shell_parse_argv (command_line,
++ &term_argc,
++ &term_argv,
++ NULL /* error */);
++
++ g_free (command_line);
++ g_free (exec_flag);
++ g_free (terminal);
++ }
++
++ g_object_unref (settings);
++
++ if (term_argv == NULL) {
++ char *check;
++
++ term_argc = 2;
++ term_argv = g_new0 (char *, 3);
++
++ check = g_find_program_in_path ("gnome-terminal");
++ if (check != NULL) {
++ term_argv[0] = check;
++ /* Note that gnome-terminal takes -x and
++ * as -e in gnome-terminal is broken we use that. */
++ term_argv[1] = g_strdup ("-x");
++ } else {
++ if (check == NULL)
++ check = g_find_program_in_path ("nxterm");
++ if (check == NULL)
++ check = g_find_program_in_path
("color-xterm");
++ if (check == NULL)
++ check = g_find_program_in_path ("rxvt");
++ if (check == NULL)
++ check = g_find_program_in_path ("xterm");
++ if (check == NULL)
++ check = g_find_program_in_path ("dtterm");
++ if (check == NULL) {
++ g_warning ("Cannot find a terminal, using
xterm, even if it may not work");
++ check = g_strdup ("xterm");
++ }
++ term_argv[0] = check;
++ term_argv[1] = g_strdup ("-e");
++ }
++ }
++ real_argc = term_argc + *argc;
++ real_argv = g_new (char *, real_argc + 1);
++
++ for (i = 0; i < term_argc; i++)
++ real_argv[i] = term_argv[i];
++
++ for (j = 0; j < *argc; j++, i++)
++ real_argv[i] = (char *)the_argv[j];
++
++ real_argv[i] = NULL;
++
++ g_free (*argv);
++ *argv = real_argv;
++ *argc = real_argc;
++
++ /* we use g_free here as we sucked all the inner strings
++ * out from it into real_argv */
++ g_free (term_argv);
++#else
++ /* FIXME: Implement when needed */
++ g_warning ("gnome_prepend_terminal_to_vector: Not implemented");
++#endif
++}
++
++
+ static char *
+ get_terminal_command_prefix (gboolean for_command)
+ {
+@@ -198,3 +328,5 @@
+
+ g_free (command_line);
+ }
++
++
diff --git
a/gnome2-libs/nautilus2/001-do-not-use-NautilusDesktopBackground.patch
b/gnome2-libs/nautilus2/001-do-not-use-NautilusDesktopBackground.patch
new file mode 100644
index 0000000..b075dcf
--- /dev/null
+++ b/gnome2-libs/nautilus2/001-do-not-use-NautilusDesktopBackground.patch
@@ -0,0 +1,74 @@
+# From
https://git.gnome.org/browse/nautilus/commit/?id=07d2ca86237fac8b5bddc4e619e43dfc813bc5e7
+From 07d2ca86237fac8b5bddc4e619e43dfc813bc5e7 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc AT gnome.org>
+Date: Tue, 19 Feb 2013 16:29:59 +0000
+Subject: desktop-canvas: don't use NautilusDesktopBacgrkound
+
+We don't need to anymore.
+---
+diff --git a/src/nautilus-desktop-canvas-view.c
b/src/nautilus-desktop-canvas-view.c
+index 340ed35..28cbd3b 100644
+--- a/src/nautilus-desktop-canvas-view.c
++++ b/src/nautilus-desktop-canvas-view.c
+@@ -41,7 +41,6 @@
+ #include <fcntl.h>
+ #include <gdk/gdkx.h>
+ #include <glib/gi18n.h>
+-#include <libnautilus-private/nautilus-desktop-background.h>
+ #include <libnautilus-private/nautilus-desktop-icon-file.h>
+ #include <libnautilus-private/nautilus-directory-notify.h>
+ #include <libnautilus-private/nautilus-file-changes-queue.h>
+@@ -76,8 +75,6 @@ struct NautilusDesktopCanvasViewDetails
+ gulong delayed_init_signal;
+ guint reload_desktop_timeout;
+ gboolean pending_rescan;
+-
+- NautilusDesktopBackground *background;
+ };
+
+ static void default_zoom_level_changed (gpointer
user_data);
+@@ -234,22 +231,6 @@ desktop_canvas_view_property_filter (GdkXEvent
*gdk_xevent,
+ return GDK_FILTER_CONTINUE;
+ }
+
+-static void
+-real_begin_loading (NautilusView *object)
+-{
+- NautilusCanvasContainer *canvas_container;
+- NautilusDesktopCanvasView *view;
+-
+- view = NAUTILUS_DESKTOP_CANVAS_VIEW (object);
+-
+- canvas_container = get_canvas_container (view);
+- if (view->details->background == NULL) {
+- view->details->background = nautilus_desktop_background_new
(canvas_container);
+- }
+-
+- NAUTILUS_VIEW_CLASS
(nautilus_desktop_canvas_view_parent_class)->begin_loading (object);
+-}
+-
+ static const char *
+ real_get_id (NautilusView *view)
+ {
+@@ -287,11 +268,6 @@ nautilus_desktop_canvas_view_dispose (GObject *object)
+ nautilus_view_update_menus,
+ canvas_view);
+
+- if (canvas_view->details->background != NULL) {
+- g_object_unref (canvas_view->details->background);
+- canvas_view->details->background = NULL;
+- }
+-
+ G_OBJECT_CLASS (nautilus_desktop_canvas_view_parent_class)->dispose
(object);
+ }
+
+@@ -304,7 +280,6 @@ nautilus_desktop_canvas_view_class_init
(NautilusDesktopCanvasViewClass *class)
+
+ G_OBJECT_CLASS (class)->dispose =
nautilus_desktop_canvas_view_dispose;
+
+- vclass->begin_loading = real_begin_loading;
+ vclass->merge_menus = real_merge_menus;
+ vclass->update_menus = real_update_menus;
+ vclass->get_view_id = real_get_id;
+--
+cgit v0.9.2
diff --git
a/gnome2-libs/nautilus2/002-add_receive_dropped_background_image.patch
b/gnome2-libs/nautilus2/002-add_receive_dropped_background_image.patch
new file mode 100644
index 0000000..f9686f8
--- /dev/null
+++ b/gnome2-libs/nautilus2/002-add_receive_dropped_background_image.patch
@@ -0,0 +1,85 @@
+# From
https://git.gnome.org/browse/nautilus/commit/?id=8b4a83ea80bf657cd8be754786e5f9daf7d5cc52
+
+From 8b4a83ea80bf657cd8be754786e5f9daf7d5cc52 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc AT gnome.org>
+Date: Tue, 19 Feb 2013 16:28:52 +0000
+Subject: canvas-dnd: don't use NautilusDesktopBackground
+
+We only use it for DnD when receiving an image drop. We can copy that
+code from NautilusDesktopBackground in a helper function.
+---
+diff --git a/libnautilus-private/nautilus-canvas-dnd.c
b/libnautilus-private/nautilus-canvas-dnd.c
+index 2d1ae24..4be79bd 100644
+--- a/libnautilus-private/nautilus-canvas-dnd.c
++++ b/libnautilus-private/nautilus-canvas-dnd.c
+@@ -37,6 +37,7 @@
+
+ #include "nautilus-file-dnd.h"
+ #include "nautilus-canvas-private.h"
++#include "nautilus-global-preferences.h"
+ #include "nautilus-link.h"
+ #include "nautilus-metadata.h"
+ #include "nautilus-selection-canvas-item.h"
+@@ -51,8 +52,10 @@
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
++#define GNOME_DESKTOP_USE_UNSTABLE_API
++#include <libgnome-desktop/gnome-bg.h>
++#include <gdesktop-enums.h>
+
+-#include <libnautilus-private/nautilus-desktop-background.h>
+ #include <libnautilus-private/nautilus-file-utilities.h>
+ #include <libnautilus-private/nautilus-file-changes-queue.h>
+ #include <stdio.h>
+@@ -1040,6 +1043,31 @@ selection_is_image_file (GList *selection_list)
+ return result;
+ }
+
++static void
++receive_dropped_background_image (const gchar *image_uri)
++{
++ GnomeBG *bg;
++ char *filename;
++
++ if (image_uri != NULL) {
++ filename = g_filename_from_uri (image_uri, NULL, NULL);
++ } else {
++ filename = NULL;
++ }
++
++ bg = gnome_bg_new ();
++
++ /* Currently, we only support tiled images. So we set the placement.
++ */
++ gnome_bg_set_placement (bg, G_DESKTOP_BACKGROUND_STYLE_WALLPAPER);
++ gnome_bg_set_filename (bg, filename);
++ gnome_bg_set_draw_background (bg, TRUE);
++
++ gnome_bg_save_to_preferences (bg, gnome_background_preferences);
++
++ g_free (filename);
++ g_object_unref (bg);
++}
+
+ static void
+ nautilus_canvas_container_receive_dropped_icons (NautilusCanvasContainer
*container,
+@@ -1083,15 +1111,8 @@ nautilus_canvas_container_receive_dropped_icons
(NautilusCanvasContainer *contai
+ }
+
+ if (real_action == (GdkDragAction)
NAUTILUS_DND_ACTION_SET_AS_BACKGROUND) {
+- NautilusDesktopBackground *background;
+-
+- background = nautilus_desktop_background_new (container);
+ selected_item =
container->details->dnd_info->drag_info.selection_list->data;
+-
+- nautilus_desktop_background_receive_dropped_background_image
(background,
+-
selected_item->uri);
+-
+- g_object_unref (background);
++ receive_dropped_background_image (selected_item->uri);
+
+ return;
+ }
+--
+cgit v0.9.2
diff --git
a/gnome2-libs/nautilus2/003-remove_gnome_bg_set_draw_background.patch
b/gnome2-libs/nautilus2/003-remove_gnome_bg_set_draw_background.patch
new file mode 100644
index 0000000..cb75035
--- /dev/null
+++ b/gnome2-libs/nautilus2/003-remove_gnome_bg_set_draw_background.patch
@@ -0,0 +1,22 @@
+# From
https://git.gnome.org/browse/nautilus/commit/?id=f30f0b01c48799ad9cc5225020cdc380b1b1c0c5
+From f30f0b01c48799ad9cc5225020cdc380b1b1c0c5 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc AT gnome.org>
+Date: Thu, 21 Feb 2013 13:01:39 +0000
+Subject: canvas-dnd: adapt for gnome-desktop API change
+
+gnome_bg_set_draw_background() has been removed.
+---
+diff --git a/libnautilus-private/nautilus-canvas-dnd.c
b/libnautilus-private/nautilus-canvas-dnd.c
+index dc32fff..b4eb586 100644
+--- a/libnautilus-private/nautilus-canvas-dnd.c
++++ b/libnautilus-private/nautilus-canvas-dnd.c
+@@ -1061,7 +1061,6 @@ receive_dropped_background_image (const gchar
*image_uri)
+ */
+ gnome_bg_set_placement (bg, G_DESKTOP_BACKGROUND_STYLE_WALLPAPER);
+ gnome_bg_set_filename (bg, filename);
+- gnome_bg_set_draw_background (bg, TRUE);
+
+ gnome_bg_save_to_preferences (bg, gnome_background_preferences);
+
+--
+cgit v0.9.2
diff --git a/gnome2-libs/nautilus2/DETAILS b/gnome2-libs/nautilus2/DETAILS
index 94a949f..50ee86b 100755
--- a/gnome2-libs/nautilus2/DETAILS
+++ b/gnome2-libs/nautilus2/DETAILS
@@ -1,10 +1,10 @@
SPELL=nautilus2
- VERSION=3.6.1
+ VERSION=3.6.3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=nautilus-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/nautilus-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/nautilus/$BRANCH/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
LICENSE[0]=GPL
LICENSE[1]=LGPL
LICENSE[2]=FDL
diff --git a/gnome2-libs/nautilus2/HISTORY b/gnome2-libs/nautilus2/HISTORY
index a9bfaf1..8e36e57 100644
--- a/gnome2-libs/nautilus2/HISTORY
+++ b/gnome2-libs/nautilus2/HISTORY
@@ -1,3 +1,15 @@
+2013-06-24 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 3.6.3
+ SOURCE matches upstream posted SHA256
+
+ * Fix compilation with gnome-desktop3 3.8+ and libgnome API 3.8
+ * PRE_BUILD: Apply 000-gnome-desktop-3.8.patch,
+ 001-do-not-use-NautilusDesktopBackground.patch,
+ 002-add_receive_dropped_background_image.patch,
+ 003-remove_gnome_bg_set_draw_background.patch
+ * gnome-desktop-3.8.patch: Borrowed from
+
http://git.pld-linux.org/gitweb.cgi/packages/gnome-panel.git/commitdiff/fd33e2e0d0dd96ab56e3ee8b297e7de83556c0e0
+
2012-10-31 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on tracker

diff --git a/gnome2-libs/nautilus2/PRE_BUILD b/gnome2-libs/nautilus2/PRE_BUILD
new file mode 100755
index 0000000..197267a
--- /dev/null
+++ b/gnome2-libs/nautilus2/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+message "${MESSAGE_COLOR}Fix compilation against gnome-desktop3
3.8+...${DEFAULT_COLOR}" &&
+patch -p1 < "${SPELL_DIRECTORY}"/000-gnome-desktop-3.8.patch &&
+message "${MESSAGE_COLOR}Fix compilation with libgnome
3.8...${DEFAULT_COLOR}" &&
+patch -p1 <
"${SPELL_DIRECTORY}"/001-do-not-use-NautilusDesktopBackground.patch &&
+patch -p1 <
"${SPELL_DIRECTORY}"/002-add_receive_dropped_background_image.patch &&
+patch -p1 <
"${SPELL_DIRECTORY}"/003-remove_gnome_bg_set_draw_background.patch
diff --git a/gnome2-libs/nautilus2/nautilus-3.6.1.tar.xz.sig
b/gnome2-libs/nautilus2/nautilus-3.6.1.tar.xz.sig
deleted file mode 100644
index 98cb72b..0000000
Binary files a/gnome2-libs/nautilus2/nautilus-3.6.1.tar.xz.sig and /dev/null
differ
diff --git a/gnome2-libs/nautilus2/nautilus-3.6.3.tar.xz.sig
b/gnome2-libs/nautilus2/nautilus-3.6.3.tar.xz.sig
new file mode 100644
index 0000000..06a5f56
Binary files /dev/null and b/gnome2-libs/nautilus2/nautilus-3.6.3.tar.xz.sig
differ
diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
index 615fbd2..eeaf11a 100755
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -1,9 +1,9 @@
SPELL=darktable
if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
- VERSION=1.2.1
+ VERSION=1.2.2
SOURCE="${SPELL}-${VERSION}.tar.xz"
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/$(echo
$VERSION|cut -f1 -d.).$(echo $VERSION|cut -f2 -d.)/${SOURCE}
-
SOURCE_HASH=sha512:d9e36ebd9d6b452a645a0b510ec54cc51694a29c90e1ca4435ac5cd1591c048092bab39820a5a733622ed3ce5400c5320e6e828c5fc3964aa8e2b0e77ebc03ff
+
SOURCE_HASH=sha512:d8ec6535119eb0a275efd13c53ec218d08c50595a7417ededf7766208fdbaf44296fbd9044d91f92521d910aff6a5df0ae97a63f87027f972443dabdddb0878e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
else
if [[ "$DARKTABLE_AUTOUPDATE" == "y" ]]; then
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index bea6100..d46a39f 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,6 @@
+2013-06-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.2.2
+
2013-05-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.2.1

diff --git a/graphics/feh/DETAILS b/graphics/feh/DETAILS
index 3c391be..cbaaafd 100755
--- a/graphics/feh/DETAILS
+++ b/graphics/feh/DETAILS
@@ -1,5 +1,5 @@
SPELL=feh
- VERSION=2.9.1
+ VERSION=2.9.3
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
diff --git a/graphics/feh/HISTORY b/graphics/feh/HISTORY
index 67b3c30..4c5c135 100644
--- a/graphics/feh/HISTORY
+++ b/graphics/feh/HISTORY
@@ -1,3 +1,6 @@
+2013-06-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.9.3
+
2013-02-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.9.1

diff --git a/graphics/qiv/DEPENDS b/graphics/qiv/DEPENDS
index dbb5dbf..b74225b 100755
--- a/graphics/qiv/DEPENDS
+++ b/graphics/qiv/DEPENDS
@@ -1,5 +1,5 @@
-depends libx11 &&
-depends gtk+2 &&
-depends imlib2 &&
+depends libx11 &&
+depends gtk+2 &&
+depends -sub X11 imlib2 &&

-optional_depends libxinerama "xinerama" "" "for Xinerama support"
+optional_depends libxinerama "xinerama" "" "for Xinerama support"
diff --git a/graphics/qiv/HISTORY b/graphics/qiv/HISTORY
index 8ef26cb..0937578 100644
--- a/graphics/qiv/HISTORY
+++ b/graphics/qiv/HISTORY
@@ -1,3 +1,7 @@
+2013-06-23 Remko van der Vossen <wich AT sourcemage.org>
+ * PRE_BUILD, qiv-2.2.4-as-needed.patch: Fix build for as-needed
+ * DEPENDS: Request X11 sub depends on imlib2
+
2013-02-17 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: version 2.2.4
* DEPENDS, BUILD: no EXIF dependency anymore
diff --git a/graphics/qiv/PRE_BUILD b/graphics/qiv/PRE_BUILD
new file mode 100755
index 0000000..0c7a039
--- /dev/null
+++ b/graphics/qiv/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < "$SPELL_DIRECTORY/qiv-2.2.4-as-needed.patch"
+
diff --git a/graphics/qiv/qiv-2.2.4-as-needed.patch
b/graphics/qiv/qiv-2.2.4-as-needed.patch
new file mode 100644
index 0000000..96b08bf
--- /dev/null
+++ b/graphics/qiv/qiv-2.2.4-as-needed.patch
@@ -0,0 +1,31 @@
+diff -Naur qiv-2.2.4.orig/Makefile qiv-2.2.4/Makefile
+--- qiv-2.2.4.orig/Makefile 2011-05-13 15:11:24.000000000 +0200
++++ qiv-2.2.4/Makefile 2013-06-24 19:03:32.000000000 +0200
+@@ -47,7 +47,8 @@
+
+ CC = gcc
+ #CFLAGS = -O -g -Wall
+-CFLAGS = -O2 -Wall \
++ENV_CFLAGS := $(CFLAGS)
++CFLAGS = $(ENV_CFLAGS) -Wall \
+ -fcaller-saves -ffast-math -fno-strength-reduce \
+ -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
+ #CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \
+@@ -99,7 +100,7 @@
+ all: $(PROGRAM)
+
+ $(PROGRAM): $(OBJS)
+- $(CC) $(CFLAGS) $(DEFINES) $(OBJS) $(LIBS) -o $(PROGRAM)
++ $(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
+
+ $(OBJS): %.o: %.c $(HEADERS)
+ $(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@
+@@ -111,7 +112,7 @@
+ debug: $(PROGRAM_G)
+
+ $(PROGRAM_G): $(OBJS_G)
+- $(CC) -g $(CFLAGS) $(DEFINES_G) $(LIBS) $(OBJS_G) -o $(PROGRAM_G)
++ $(CC) -g $(CFLAGS) $(DEFINES_G) $(LFLAGS) -o $(PROGRAM_G) $(OBJS_G)
$(LIBS)
+
+ $(OBJS_G): %.g: %.c $(HEADERS)
+ $(CC) -c -g $(CFLAGS) $(DEFINES_G) $(INCLUDES) $< -o $@
diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index e2ce3dd..03db091 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -12,12 +12,6 @@ CFLAGS="${CFLAGS//-O3/-O2}" &&
CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&

#
-# -ffast-math breaks plugins
-#
-CFLAGS="${CFLAGS//-ffast-math/}" &&
-CXXFLAGS="${CXXFLAGS//-ffast-math/}" &&
-
-#
# Avoid buggy GCC 4.6 AVX code generation, which breaks libxul
#
local gccver=$(gcc -dumpversion) &&
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index a17e3d2..9bc8159 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -16,11 +16,6 @@ depends glib2
&&
depends pango &&
depends cairo &&

-optional_depends gnome-vfs2 \
- "--enable-gnomevfs" \
- "--disable-gnomevfs" \
- "for GnomeVFS support" &&
-
optional_depends startup-notification \
'--enable-startup-notification' \
'--disable-startup-notification' \
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 6e2dbc2..44ea9f1 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,14 +1,13 @@
SPELL=firefox
- PATCHLEVEL=1
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=21.0
+ VERSION=22.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=21.0
+ VERSION=22.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -16,7 +15,7 @@ else

SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=64
+ SECURITY_PATCH=65
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 4a4c9f1..02ad8fd 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,13 @@
+2013-06-26 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Remove gnome-vfs2 support (broken)
+ See https://bugzilla.mozilla.org/show_bug.cgi?id=799458, gnome-vfs
+ support is disabled by default. They say it works, but the last
+ few firefox releases it has not worked for me.
+
+2013-06-25 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 22.0, SECURITY_PATCH++
+ * BUILD: removed now useless fast math fix
+
2013-06-17 Pol Vinogradov <vin.public AT gmail.com>
* mozconfig: added -fno-fast-math to prevent segfaults

diff --git a/http/w3m/HISTORY b/http/w3m/HISTORY
index 355de29..af9dab5 100644
--- a/http/w3m/HISTORY
+++ b/http/w3m/HISTORY
@@ -1,3 +1,6 @@
+2013-06-24 Remko van der Vossen <wich AT sourcemage.org>
+ * PRE_BUILD: fix build failure with recent libgc
+
2013-01-30 Remko van der Vossen <wich AT sourcemage.org>
* PRE_BUILD: fix build failure with recent glibc

diff --git a/http/w3m/PRE_BUILD b/http/w3m/PRE_BUILD
index dc36f5b..9ecd88a 100755
--- a/http/w3m/PRE_BUILD
+++ b/http/w3m/PRE_BUILD
@@ -9,4 +9,5 @@ sedit "s:CFLAGS=\$(OPTS):CFLAGS =:g" w3mimg/x11/Makefile.in
&&
sedit 's/file_handle/&_w3m/' istream.h &&
sedit 's/file_handle/&_w3m/' istream.c &&

-patch -p0 < "$SCRIPT_DIRECTORY"/fb_imlib2.c.patch
+patch -p0 < "$SPELL_DIRECTORY/fb_imlib2.c.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/gc72.patch"
diff --git a/http/w3m/gc72.patch b/http/w3m/gc72.patch
new file mode 100644
index 0000000..47bd4c8
--- /dev/null
+++ b/http/w3m/gc72.patch
@@ -0,0 +1,13 @@
+diff -Naur old/main.c new/main.c
+--- old/main.c 2011-01-04 20:42:19.000000000 +1100
++++ new/main.c 2012-07-04 21:49:10.136212236 +1000
+@@ -833,7 +833,8 @@
+ mySignal(SIGPIPE, SigPipe);
+ #endif
+
+- orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
++ orig_GC_warn_proc = GC_get_warn_proc();
++ GC_set_warn_proc(wrap_GC_warn_proc);
+ err_msg = Strnew();
+ if (load_argc == 0) {
+ /* no URL specified */
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 7f8ed03..4db41e5 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2013-06-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.4.50: added
+ * info/patches/maintenance_patches_3/patch-3.0.83: added
+
2013-06-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* latest.defaults: LATEST_maintenance_patches_3=patch-3.9.7
* info/patches/maintenance_patches_3/patch-3.9.7: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.83
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.83
new file mode 100755
index 0000000..062901c
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.83
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.83"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="f4d75387a697f9a6ca611eda06379cb4eaa45fe2"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.50
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.50
new file mode 100755
index 0000000..f241dbe
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.50
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.50"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="2ac7bfac8ca49e9e05c5ab80f1a41ae70f9728de"
diff --git a/mail/claws-mail-extra-plugins/BUILD
b/mail/claws-mail-extra-plugins/BUILD
index 0d4eaa0..27ba77d 100755
--- a/mail/claws-mail-extra-plugins/BUILD
+++ b/mail/claws-mail-extra-plugins/BUILD
@@ -1,6 +1 @@
-for SYLPHEED_PLUGIN in $SYLPHEED_CLAWS_EXTRA_PLUGINS
-do
- message "${MESSAGE_COLOR}claws-mail-extra-plugin $SYLPHEED_PLUGIN is being
built...${DEFAULT_COLOR}"
- cd $SOURCE_DIRECTORY/$SYLPHEED_PLUGIN*
- default_build
-done
+true
diff --git a/mail/claws-mail-extra-plugins/CONFIGURE
b/mail/claws-mail-extra-plugins/CONFIGURE
deleted file mode 100755
index 1aba4cd..0000000
--- a/mail/claws-mail-extra-plugins/CONFIGURE
+++ /dev/null
@@ -1,23 +0,0 @@
-persistent_add SYLPHEED_CLAWS_EXTRA_PLUGINS &&
-SYLPHEED_CLAWS_EXTRA_PLUGINS="acpi_notifier \
- address_keeper \
- archive \
- att_remover \
- attachwarner \
- bsfilter_plugin \
- clamd \
- fancy \
- fetchinfo-plugin \
- gdata_plugin \
- geolocation_plugin \
- gtkhtml2_viewer \
- mailmbox \
- newmail \
- notification_plugin \
- pdf_viewer \
- perl_plugin \
- python_plugin \
- rssyl \
- spam_report \
- tnef_parse \
- vcalendar"
diff --git a/mail/claws-mail-extra-plugins/DETAILS
b/mail/claws-mail-extra-plugins/DETAILS
index a039a53..427b6a5 100755
--- a/mail/claws-mail-extra-plugins/DETAILS
+++ b/mail/claws-mail-extra-plugins/DETAILS
@@ -1,11 +1,12 @@
SPELL=claws-mail-extra-plugins
VERSION=3.9.0
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL=$SOURCEFORGE_URL/sylpheed-claws/$SOURCE
- SOURCE2=${SOURCE}.asc
- SOURCE2_URL=${SOURCE_URL}.asc
- SOURCE_GPG=sylpheed.gpg:${SOURCE}.asc
- SOURCE2_IGNORE=signature
+ PATCHLEVEL=1
+# SOURCE=$SPELL-$VERSION.tar.bz2
+# SOURCE_URL=$SOURCEFORGE_URL/sylpheed-claws/$SOURCE
+# SOURCE2=${SOURCE}.asc
+# SOURCE2_URL=${SOURCE_URL}.asc
+# SOURCE_GPG=sylpheed.gpg:${SOURCE}.asc
+# SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.claws-mail.org/plugins.php
ENTERED=20060926
diff --git a/mail/claws-mail-extra-plugins/HISTORY
b/mail/claws-mail-extra-plugins/HISTORY
index d7e94d9..ca962a4 100644
--- a/mail/claws-mail-extra-plugins/HISTORY
+++ b/mail/claws-mail-extra-plugins/HISTORY
@@ -1,145 +1,2 @@
-2012-11-18 Pol Vinogradov <vin.public AT gmail.com>
- * DETAILS: 3.9.0
-
-2012-06-29 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.8.1
- * CONFIGURE: +pdf_viewer
-
-2011-12-24 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.8.0
-
-2011-08-29 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.7.10
- * CONFIGURE: +gdata_plugin
-
-2011-04-12 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.7.9
-
-2011-02-24 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.7.8
-
-2010-11-22 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.7.7
- * CONFIGURE: -cachesaver, -synce_plugin, +address_keeper, +clamd
-
-2010-05-18 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: Improved description
-
-2010-05-03 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.7.6
-
-2010-02-01 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.7.5
-
-2010-01-11 Ladislav Hagara <hgr AT vabo.cz>
- * DEPENDS: added optional_depends bsfilter for bsfilter_plugin
-
-2010-01-10 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.7.4
- * CONFIGURE: +geolocation_plugin
- * DEPENDS: added optional_depends libchamplain for geolocation_plugin
-
-2009-10-09 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.7.3
- * CONFIGURE: +python_plugin
-
-2009-07-03 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.7.2
- * CONFIGURE: +bsfilter_plugin, +fancy
- * DEPENDS: added optional_depends webkitgtk for fancy plugin
-
-2009-03-06 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.7.1
-
-2008-12-19 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.7.0
-
-2008-10-10 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.6.1
-
-2008-10-04 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.6.0
- * CONFIGURE: -smime, part of claws-mail now
-
-2008-07-26 Eric Sandall <sandalle AT sourcemage.org>
- * INSTALL: Fails install with multiple make jobs
-
-2008-06-29 Ladislav Hagara <hgr AT vabo.cz>
- * DEPENDS: added optional_depends libarchive
-
-2008-06-27 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.5.0
- * CONFIGURE: +archive, -pdf_viewer (licensing issues)
-
-2008-04-19 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.4.0
-
-2008-02-25 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.3.1
- * CONFIGURE, DEPENDS: removed clamav plugin (licensing problems)
-
-2008-02-08 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.3.0
- * CONFIGURE: added new clamav plugin
- * DEPENDS: added optional_depends clamav
-
-2007-12-17 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.2.0
-
-2007-11-19 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.1.0
- * CONFIGURE: added new tnef_parse plugin
- * DEPENDS: added optional_depends libytnef
-
-2007-10-03 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: fixed WEB_SITE
-
-2007-09-17 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.0.1
-
-2007-09-03 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 3.0.0
- * CONFIGURE: added spam_report
-
-2007-07-03 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 2.10.0
-
-2007-05-08 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 2.9.2
-
-2007-04-22 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 2.9.1
-
-2007-04-16 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 2.9.0
- * CONFIGURE: removed maildir and etpan-privacy plugins
-
-2007-02-26 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 2.8.0
- * CONFIGURE: added new pdf_viewer plugin
-
-2007-01-19 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 2.7.1
- * CONFIGURE: added new attachwarner plugin
-
-2007-01-11 George Sherwood <george AT beernabeer.com>
- * DETAILS: Updated to version 2.7.0
-
-2006-12-12 George Sherwood <george AT beernabeer.com>
- * ALL: Created from sylpheed-claws-extra-plugins
- * DETAILS: Updated to version 2.6.1
-
-2006-11-20 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 2.6.0
-
-2006-10-04 Ladislav Hagara <hgr AT vabo.cz>
- * TRIGGERS: added, on_cast sylpheed-claws cast_self
-
-2006-09-28 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 2.5.2
- * CONFIGURE: added new synce_plugin
- * DEPENDS: added optional_depends synce-libsynce and synce-librapi2
-
-2006-09-26 Ladislav Hagara <hgr AT vabo.cz>
- * *: created this spell, version 2.5.0
-
+2013-06-24 Ladislav Hagara <hgr AT vabo.cz>
+ * spell deprecated, part of claws-mail since 3.9.1
diff --git a/mail/claws-mail-extra-plugins/INSTALL
b/mail/claws-mail-extra-plugins/INSTALL
index 7182066..27ba77d 100755
--- a/mail/claws-mail-extra-plugins/INSTALL
+++ b/mail/claws-mail-extra-plugins/INSTALL
@@ -1,7 +1 @@
-make_single &&
-for SYLPHEED_PLUGIN in $SYLPHEED_CLAWS_EXTRA_PLUGINS
-do
- message "${MESSAGE_COLOR}claws-mail-extra-plugin $SYLPHEED_PLUGIN is being
installed ...${DEFAULT_COLOR}"
- cd $SOURCE_DIRECTORY/$SYLPHEED_PLUGIN*
- default_install
-done
+true
diff --git a/mail/claws-mail-extra-plugins/PRE_BUILD
b/mail/claws-mail-extra-plugins/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/mail/claws-mail-extra-plugins/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/mail/claws-mail-extra-plugins/UP_TRIGGERS
b/mail/claws-mail-extra-plugins/UP_TRIGGERS
new file mode 100755
index 0000000..3873a4a
--- /dev/null
+++ b/mail/claws-mail-extra-plugins/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger claws-mail-extra-plugins dispel_self
+up_trigger claws-mail cast_self
diff --git a/mail/claws-mail/CONFLICTS b/mail/claws-mail/CONFLICTS
index 7743d27..0031463 100755
--- a/mail/claws-mail/CONFLICTS
+++ b/mail/claws-mail/CONFLICTS
@@ -1,3 +1,4 @@
conflicts sylpheed-claws y
+conflicts claws-mail-extra-plugins y
conflicts sylpheed
conflicts sylpheed-gtk2
diff --git a/mail/claws-mail/DETAILS b/mail/claws-mail/DETAILS
index 09ee11e..074c7e8 100755
--- a/mail/claws-mail/DETAILS
+++ b/mail/claws-mail/DETAILS
@@ -1,9 +1,8 @@
SPELL=claws-mail
- VERSION=3.9.0
+ VERSION=3.9.2
SECURITY_PATCH=1
- PATCHLEVEL=1
SOURCE=$SPELL-${VERSION}.tar.bz2
- SOURCE_URL=$SOURCEFORGE_URL/sylpheed-claws/$SOURCE
+
SOURCE_URL=$SOURCEFORGE_URL/sylpheed-claws/Claws%20Mail/$VERSION/$SOURCE
SOURCE2=${SOURCE}.asc
SOURCE2_URL=${SOURCE_URL}.asc
SOURCE_GPG=sylpheed.gpg:${SOURCE}.asc
diff --git a/mail/claws-mail/HISTORY b/mail/claws-mail/HISTORY
index ba9d5b9..1c90e63 100644
--- a/mail/claws-mail/HISTORY
+++ b/mail/claws-mail/HISTORY
@@ -1,3 +1,9 @@
+2013-06-24 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS: claws-mail-extra-plugins added, part of claws-mail now
+
+2013-06-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.9.2
+
2013-01-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: added optional dependency on bogofilter and
network-manager, removed dependencies on libffi, bzip2, libxau,
diff --git a/mail/greylist/DETAILS b/mail/greylist/DETAILS
index 7ca9c6b..26f9a7d 100755
--- a/mail/greylist/DETAILS
+++ b/mail/greylist/DETAILS
@@ -1,5 +1,6 @@
SPELL=greylist
VERSION=2
+ PATCHLEVEL=1
SOURCE=${SPELL}-release-${VERSION}.tar.gz
SOURCE_URL[0]=http://mimo.gn.apc.org/system/files/file/${SOURCE}

SOURCE_HASH=sha512:cc31e0918226d5c704e950394667e83106ed9ce80540e8ba424c66d907f6e8fe5bfe36186c9e1869b290919db3cafa96c45ff787780b841b2c7ea7ddcdd5637b
diff --git a/mail/greylist/HISTORY b/mail/greylist/HISTORY
index 6398dda..0388899 100644
--- a/mail/greylist/HISTORY
+++ b/mail/greylist/HISTORY
@@ -1,3 +1,8 @@
+2013-06-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: apply patch
+ * collect.patch: added, to fix collecting triplets (init mode support)
+
2013-01-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: corrected license array

diff --git a/mail/greylist/PRE_BUILD b/mail/greylist/PRE_BUILD
index aed13af..458066b 100755
--- a/mail/greylist/PRE_BUILD
+++ b/mail/greylist/PRE_BUILD
@@ -10,6 +10,9 @@ patch -p0 < "$SPELL_DIRECTORY/dbi.patch" &&
# fix build with new Boost >= 1.49
patch -p0 < "$SPELL_DIRECTORY/boost-149.patch" &&

+# fix collecting triplets (timeout=0)
+patch -p0 < "$SPELL_DIRECTORY/collect.patch" &&
+
# fixed SQL syntax error when doing query on table
# (missing ` after table name in case with no 'where' clause)
patch -p0 < "$SPELL_DIRECTORY/query.patch"
diff --git a/mail/greylist/collect.patch b/mail/greylist/collect.patch
new file mode 100644
index 0000000..0ebd19c
--- /dev/null
+++ b/mail/greylist/collect.patch
@@ -0,0 +1,23 @@
+--- src/greylist.h.orig 2010-09-07 01:55:58.000000000 +0400
++++ src/greylist.h 2013-06-26 19:19:21.958909736 +0400
+@@ -34,8 +34,18 @@
+ unsigned long count, uts;
+ if (!findTriplet(triplet, id, count, uts)) {
+ insertTriplet(triplet);
+- extra.setPrefix("new");
+- return Core::defer;
++ if (_timeout == 0) {
++ /* collecting triplets (from
http://mimo.gn.apc.org/greylist/configuration/policy):
++
++ There is no support for the init mode - create the database
structure manually
++ and use timeout=0 to collect triplets without greylisting.
++ */
++ extra.set("ok", 0, _timeout);
++ return Core::dunno;
++ } else {
++ extra.setPrefix("new");
++ return Core::defer;
++ }
+ }
+ unsigned long lNow = getNow();
+ unsigned long lTimeDiff = 0;
diff --git a/net/iptables/DETAILS b/net/iptables/DETAILS
index 2b7d4eb..26a92ab 100755
--- a/net/iptables/DETAILS
+++ b/net/iptables/DETAILS
@@ -1,5 +1,5 @@
SPELL=iptables
- VERSION=1.4.17
+ VERSION=1.4.19.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://www.iptables.org/projects/$SPELL/files/$SOURCE
diff --git a/net/iptables/HISTORY b/net/iptables/HISTORY
index abf89d5..732d3f1 100644
--- a/net/iptables/HISTORY
+++ b/net/iptables/HISTORY
@@ -1,3 +1,6 @@
+2013-06-21 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: 1.4.19.1
+
2012-12-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.17

diff --git a/python-pypi/fdb/DETAILS b/python-pypi/fdb/DETAILS
index 13adc4e..3aed2b0 100755
--- a/python-pypi/fdb/DETAILS
+++ b/python-pypi/fdb/DETAILS
@@ -1,6 +1,6 @@
SPELL=fdb
- VERSION=1.3
-
SOURCE_HASH=sha512:1f9345d3dd354da8299db8febfede651675bf5fd8959bd1e83d740a2894843d78ba1268356b6c6c55d8ec7b19676468a93940250769de24b85d2a1f0ea916007
+ VERSION=1.4
+
SOURCE_HASH=sha512:a5e17e069201de0933bd1d48b50e8f19329f81d6d38315e93b84fd7559b9f5461b9a8b948ee53926f42ecf973dcee93ec03bf783bf4ca6b2ceb13672c6192484
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL=http://pypi.python.org/packages/source/f/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/python-pypi/fdb/HISTORY b/python-pypi/fdb/HISTORY
index 9cbd94e..06794b7 100644
--- a/python-pypi/fdb/HISTORY
+++ b/python-pypi/fdb/HISTORY
@@ -1,3 +1,6 @@
+2013-06-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4
+
2013-06-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3

diff --git a/shell-term-fm/rdesktop/DETAILS b/shell-term-fm/rdesktop/DETAILS
index 2fbd39c..3c753a3 100755
--- a/shell-term-fm/rdesktop/DETAILS
+++ b/shell-term-fm/rdesktop/DETAILS
@@ -3,7 +3,7 @@
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
+
SOURCE_URL[0]=http://sourceforge.net/projects/$SPELL/files/$SPELL/$VERSION/$SOURCE/download

SOURCE_HASH=sha512:aaefbcda77a333ec065e42aa20e5335e48c51858dab860495528b399696c0ed6594ab9c5234716682e7ebef81d36cc6d157eedae700e0df209da9034d04887fc
WEB_SITE=http://www.rdesktop.org
ENTERED=20010922
diff --git a/shell-term-fm/rdesktop/HISTORY b/shell-term-fm/rdesktop/HISTORY
index 0c9dc15..06d59f6 100644
--- a/shell-term-fm/rdesktop/HISTORY
+++ b/shell-term-fm/rdesktop/HISTORY
@@ -1,3 +1,6 @@
+2013-06-24 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: Proper download link
+
2012-07-25 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS, BUILD: commented libvncserver support, as of broken rdp2vnc

diff --git a/utils/sudo/BUILD b/utils/sudo/BUILD
index fbbabac..c75bb7d 100755
--- a/utils/sudo/BUILD
+++ b/utils/sudo/BUILD
@@ -1,7 +1,10 @@
local editor="$(get_spell_provider $SPELL TEXT-EDITOR)" &&
-hash $editor &&
-editor=$(hash -t $editor) &&

-OPTS="$OPTS --with-editor=$editor" &&
+if [[ -n ${editor} ]]; then
+ hash $editor &&
+ editor=$(hash -t $editor) &&
+
+ OPTS="$OPTS --with-editor=$editor"
+fi &&

default_build
diff --git a/utils/sudo/HISTORY b/utils/sudo/HISTORY
index 6d11ce9..6cc5793 100644
--- a/utils/sudo/HISTORY
+++ b/utils/sudo/HISTORY
@@ -1,3 +1,6 @@
+2013-06-24 Remko van der Vossen <wich AT sourcemage.org>
+ * BUILD: fix BUILD for case when no editor selected
+
2013-06-19 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.7

diff --git a/utils/xen/DETAILS b/utils/xen/DETAILS
index d6c6fb1..a86a167 100755
--- a/utils/xen/DETAILS
+++ b/utils/xen/DETAILS
@@ -1,6 +1,6 @@
SPELL=xen
- VERSION=4.1.4
- SECURITY_PATCH=7
+ VERSION=4.1.5
+ SECURITY_PATCH=8
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index 06aa996..b4429d6 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,8 @@
+2013-06-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.1.5; SECURITY_PATCH++
+ * PRE_BUILD: removed patches
+ * xsa-*.patch: removed, fixed by upstream
+
2013-02-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* PRE_BUILD: apply patches
diff --git a/utils/xen/PRE_BUILD b/utils/xen/PRE_BUILD
index ba38b55..c7f9a4a 100755
--- a/utils/xen/PRE_BUILD
+++ b/utils/xen/PRE_BUILD
@@ -1,13 +1,6 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&

-patch -p1 < "$SPELL_DIRECTORY/xsa-27-1.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/xsa-33.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/xsa-36.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/xsa-38.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/xsa-41.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/xsa-41-1.patch" &&
-
if [[ $XEN_UPINIT != y ]]; then
sedit "s:all install-initd:all:" tools/hotplug/Linux/Makefile
fi &&
diff --git a/utils/xen/xsa-27-1.patch b/utils/xen/xsa-27-1.patch
deleted file mode 100644
index 4260b20..0000000
--- a/utils/xen/xsa-27-1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/xen/arch/x86/mm/paging.c Wed Jan 16 14:15:12 2013 +0000
-+++ b/xen/arch/x86/mm/paging.c Thu Jan 17 11:17:32 2013 +0000
-@@ -534,7 +534,8 @@ int paging_log_dirty_range(struct domain
-
- size = ((nr + BITS_PER_LONG - 1) / BITS_PER_LONG) * sizeof (long);
- rv = 0;
-- for ( off = 0; !rv && off < size; off += sizeof zeroes )
-+ off = 0;
-+ while ( !rv && off < size )
- {
- int todo = min(size - off, (int) PAGE_SIZE);
- if ( copy_to_guest_offset(dirty_bitmap, off, zeroes, todo) )
diff --git a/utils/xen/xsa-33.patch b/utils/xen/xsa-33.patch
deleted file mode 100644
index d0bdeb4..0000000
--- a/utils/xen/xsa-33.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-VT-d: fix interrupt remapping source validation for devices behind
-legacy bridges
-
-Using SVT_VERIFY_BUS here doesn't make sense; native Linux also
-uses SVT_VERIFY_SID_SQ here instead.
-
-This is XSA-33 / CVE-2012-5634.
-
-Signed-off-by: Jan Beulich <jbeulich AT suse.com>
-
---- a/xen/drivers/passthrough/vtd/intremap.c
-+++ b/xen/drivers/passthrough/vtd/intremap.c
-@@ -499,7 +499,7 @@ static void set_msi_source_id(struct pci_dev *pdev,
struct iremap_entry *ire)
- set_ire_sid(ire, SVT_VERIFY_BUS, SQ_ALL_16,
- (bus << 8) | pdev->bus);
- else if ( pdev_type(bus, devfn) == DEV_TYPE_LEGACY_PCI_BRIDGE )
-- set_ire_sid(ire, SVT_VERIFY_BUS, SQ_ALL_16,
-+ set_ire_sid(ire, SVT_VERIFY_SID_SQ, SQ_ALL_16,
- PCI_BDF2(bus, devfn));
- }
- break;
diff --git a/utils/xen/xsa-36.patch b/utils/xen/xsa-36.patch
deleted file mode 100644
index f4b15e2..0000000
--- a/utils/xen/xsa-36.patch
+++ /dev/null
@@ -1,369 +0,0 @@
-ACPI: acpi_table_parse() should return handler's error code
-
-Currently, the error code returned by acpi_table_parse()'s handler
-is ignored. This patch will propagate handler's return value to
-acpi_table_parse()'s caller.
-
-AMD,IOMMU: Clean up old entries in remapping tables when creating new
-interrupt mapping.
-
-When changing the affinity of an IRQ associated with a passed
-through PCI device, clear previous mapping.
-
-In addition, because some BIOSes may incorrectly program IVRS
-entries for IOAPIC try to check for entry's consistency. Specifically,
-if conflicting entries are found disable IOMMU if per-device
-remapping table is used. If entries refer to bogus IOAPIC IDs
-disable IOMMU unconditionally
-
-AMD,IOMMU: Disable IOMMU if SATA Combined mode is on
-
-AMD's SP5100 chipset can be placed into SATA Combined mode
-that may cause prevent dom0 from booting when IOMMU is
-enabled and per-device interrupt remapping table is used.
-While SP5100 erratum 28 requires BIOSes to disable this mode,
-some may still use it.
-
-This patch checks whether this mode is on and, if per-device
-table is in use, disables IOMMU.
-
-AMD,IOMMU: Make per-device interrupt remapping table default
-
-Using global interrupt remapping table may be insecure, as
-described by XSA-36. This patch makes per-device mode default.
-
-This is XSA-36 / CVE-2013-0153.
-
-Signed-off-by: Jan Beulich <jbeulich AT suse.com>
-Signed-off-by: Boris Ostrovsky <boris.ostrovsky AT amd.com>
-
---- a/xen/arch/x86/irq.c
-+++ b/xen/arch/x86/irq.c
-@@ -1677,9 +1677,6 @@ int map_domain_pirq(
- d->arch.pirq_irq[pirq] = irq;
- d->arch.irq_pirq[irq] = pirq;
- spin_unlock_irqrestore(&desc->lock, flags);
--
-- if ( opt_irq_vector_map == OPT_IRQ_VECTOR_MAP_PERDEV )
-- printk(XENLOG_INFO "Per-device vector maps for GSIs not
implemented yet.\n");
- }
-
- done:
---- a/xen/drivers/acpi/tables.c
-+++ b/xen/drivers/acpi/tables.c
-@@ -267,7 +267,7 @@ acpi_table_parse_madt(enum acpi_madt_typ
- * @handler: handler to run
- *
- * Scan the ACPI System Descriptor Table (STD) for a table matching @id,
-- * run @handler on it. Return 0 if table found, return on if not.
-+ * run @handler on it.
- */
- int acpi_table_parse(char *id, acpi_table_handler handler)
- {
-@@ -282,8 +282,7 @@ int acpi_table_parse(char *id, acpi_tabl
- acpi_get_table(id, 0, &table);
-
- if (table) {
-- handler(table);
-- return 0;
-+ return handler(table);
- } else
- return 1;
- }
---- a/xen/drivers/passthrough/amd/iommu_acpi.c
-+++ b/xen/drivers/passthrough/amd/iommu_acpi.c
-@@ -21,6 +21,7 @@
- #include <xen/config.h>
- #include <xen/errno.h>
- #include <asm/apicdef.h>
-+#include <asm/io_apic.h>
- #include <asm/amd-iommu.h>
- #include <asm/hvm/svm/amd-iommu-proto.h>
- #include <asm/hvm/svm/amd-iommu-acpi.h>
-@@ -29,7 +30,6 @@ extern unsigned long amd_iommu_page_entr
- extern unsigned short ivrs_bdf_entries;
- extern struct ivrs_mappings *ivrs_mappings;
- extern unsigned short last_bdf;
--extern int ioapic_bdf[MAX_IO_APICS];
- extern void *shared_intremap_table;
-
- static void add_ivrs_mapping_entry(
-@@ -636,6 +636,7 @@ static u16 __init parse_ivhd_device_spec
- u16 header_length, u16 block_length, struct amd_iommu *iommu)
- {
- u16 dev_length, bdf;
-+ int apic;
-
- dev_length = sizeof(struct acpi_ivhd_device_special);
- if ( header_length < (block_length + dev_length) )
-@@ -652,9 +653,58 @@ static u16 __init parse_ivhd_device_spec
- }
-
- add_ivrs_mapping_entry(bdf, bdf, ivhd_device->header.flags, iommu);
-- /* set device id of ioapic */
-- ioapic_bdf[ivhd_device->special.handle] = bdf;
-- return dev_length;
-+
-+ if ( ivhd_device->special.variety != 1 /* ACPI_IVHD_IOAPIC */ )
-+ {
-+ if ( ivhd_device->special.variety != 2 /* ACPI_IVHD_HPET */ )
-+ printk(XENLOG_ERR "Unrecognized IVHD special variety %#x\n",
-+ ivhd_device->special.variety);
-+ return dev_length;
-+ }
-+
-+ /*
-+ * Some BIOSes have IOAPIC broken entries so we check for IVRS
-+ * consistency here --- whether entry's IOAPIC ID is valid and
-+ * whether there are conflicting/duplicated entries.
-+ */
-+ for ( apic = 0; apic < nr_ioapics; apic++ )
-+ {
-+ if ( IO_APIC_ID(apic) != ivhd_device->special.handle )
-+ continue;
-+
-+ if ( ioapic_bdf[ivhd_device->special.handle].pin_setup )
-+ {
-+ if ( ioapic_bdf[ivhd_device->special.handle].bdf == bdf )
-+ AMD_IOMMU_DEBUG("IVHD Warning: Duplicate IO-APIC %#x
entries\n",
-+ ivhd_device->special.handle);
-+ else
-+ {
-+ printk(XENLOG_ERR "IVHD Error: Conflicting IO-APIC %#x
entries\n",
-+ ivhd_device->special.handle);
-+ if ( amd_iommu_perdev_intremap )
-+ return 0;
-+ }
-+ }
-+ else
-+ {
-+ /* set device id of ioapic */
-+ ioapic_bdf[ivhd_device->special.handle].bdf = bdf;
-+
-+ ioapic_bdf[ivhd_device->special.handle].pin_setup =
xzalloc_array(
-+ unsigned long, BITS_TO_LONGS(nr_ioapic_registers[apic]));
-+ if ( nr_ioapic_registers[apic] &&
-+ !ioapic_bdf[IO_APIC_ID(apic)].pin_setup )
-+ {
-+ printk(XENLOG_ERR "IVHD Error: Out of memory\n");
-+ return 0;
-+ }
-+ }
-+ return dev_length;
-+ }
-+
-+ printk(XENLOG_ERR "IVHD Error: Invalid IO-APIC %#x\n",
-+ ivhd_device->special.handle);
-+ return 0;
- }
-
- static int __init parse_ivhd_block(struct acpi_ivhd_block_header
*ivhd_block)
---- a/xen/drivers/passthrough/amd/iommu_init.c
-+++ b/xen/drivers/passthrough/amd/iommu_init.c
-@@ -897,12 +897,45 @@ static int __init amd_iommu_setup_device
- return 0;
- }
-
-+/* Check whether SP5100 SATA Combined mode is on */
-+static bool_t __init amd_sp5100_erratum28(void)
-+{
-+ u32 bus, id;
-+ u16 vendor_id, dev_id;
-+ u8 byte;
-+
-+ for (bus = 0; bus < 256; bus++)
-+ {
-+ id = pci_conf_read32(bus, 0x14, 0, PCI_VENDOR_ID);
-+
-+ vendor_id = id & 0xffff;
-+ dev_id = (id >> 16) & 0xffff;
-+
-+ /* SP5100 SMBus module sets Combined mode on */
-+ if (vendor_id != 0x1002 || dev_id != 0x4385)
-+ continue;
-+
-+ byte = pci_conf_read8(bus, 0x14, 0, 0xad);
-+ if ( (byte >> 3) & 1 )
-+ {
-+ printk(XENLOG_WARNING "AMD-Vi: SP5100 erratum 28 detected,
disabling IOMMU.\n"
-+ "If possible, disable SATA Combined mode in BIOS or
contact your vendor for BIOS update.\n");
-+ return 1;
-+ }
-+ }
-+
-+ return 0;
-+}
-+
- int __init amd_iommu_init(void)
- {
- struct amd_iommu *iommu;
-
- BUG_ON( !iommu_found() );
-
-+ if ( amd_iommu_perdev_intremap && amd_sp5100_erratum28() )
-+ goto error_out;
-+
- irq_to_iommu = xmalloc_array(struct amd_iommu *, nr_irqs);
- if ( irq_to_iommu == NULL )
- goto error_out;
---- a/xen/drivers/passthrough/amd/iommu_intr.c
-+++ b/xen/drivers/passthrough/amd/iommu_intr.c
-@@ -27,7 +27,7 @@
- #define INTREMAP_LENGTH 0xB
- #define INTREMAP_ENTRIES (1 << INTREMAP_LENGTH)
-
--int ioapic_bdf[MAX_IO_APICS];
-+struct ioapic_bdf ioapic_bdf[MAX_IO_APICS];
- extern struct ivrs_mappings *ivrs_mappings;
- extern unsigned short ivrs_bdf_entries;
- void *shared_intremap_table;
-@@ -117,12 +117,12 @@ void invalidate_interrupt_table(struct a
- static void update_intremap_entry_from_ioapic(
- int bdf,
- struct amd_iommu *iommu,
-- struct IO_APIC_route_entry *ioapic_rte)
-+ const struct IO_APIC_route_entry *rte,
-+ const struct IO_APIC_route_entry *old_rte)
- {
- unsigned long flags;
- u32* entry;
- u8 delivery_mode, dest, vector, dest_mode;
-- struct IO_APIC_route_entry *rte = ioapic_rte;
- int req_id;
- spinlock_t *lock;
- int offset;
-@@ -138,6 +138,14 @@ static void update_intremap_entry_from_i
- spin_lock_irqsave(lock, flags);
-
- offset = get_intremap_offset(vector, delivery_mode);
-+ if ( old_rte )
-+ {
-+ int old_offset = get_intremap_offset(old_rte->vector,
-+ old_rte->delivery_mode);
-+
-+ if ( offset != old_offset )
-+ free_intremap_entry(bdf, old_offset);
-+ }
- entry = (u32*)get_intremap_entry(req_id, offset);
- update_intremap_entry(entry, vector, delivery_mode, dest_mode, dest);
-
-@@ -176,7 +184,7 @@ int __init amd_iommu_setup_ioapic_remapp
- continue;
-
- /* get device id of ioapic devices */
-- bdf = ioapic_bdf[IO_APIC_ID(apic)];
-+ bdf = ioapic_bdf[IO_APIC_ID(apic)].bdf;
- iommu = find_iommu_for_device(bdf);
- if ( !iommu )
- {
-@@ -207,6 +215,7 @@ int __init amd_iommu_setup_ioapic_remapp
- flush_command_buffer(iommu);
- spin_unlock_irqrestore(&iommu->lock, flags);
- }
-+ set_bit(pin, ioapic_bdf[IO_APIC_ID(apic)].pin_setup);
- }
- }
- return 0;
-@@ -218,6 +227,7 @@ void amd_iommu_ioapic_update_ire(
- struct IO_APIC_route_entry old_rte = { 0 };
- struct IO_APIC_route_entry new_rte = { 0 };
- unsigned int rte_lo = (reg & 1) ? reg - 1 : reg;
-+ unsigned int pin = (reg - 0x10) / 2;
- int saved_mask, bdf;
- struct amd_iommu *iommu;
-
-@@ -228,7 +238,7 @@ void amd_iommu_ioapic_update_ire(
- }
-
- /* get device id of ioapic devices */
-- bdf = ioapic_bdf[IO_APIC_ID(apic)];
-+ bdf = ioapic_bdf[IO_APIC_ID(apic)].bdf;
- iommu = find_iommu_for_device(bdf);
- if ( !iommu )
- {
-@@ -254,6 +264,14 @@ void amd_iommu_ioapic_update_ire(
- *(((u32 *)&new_rte) + 1) = value;
- }
-
-+ if ( new_rte.mask &&
-+ !test_bit(pin, ioapic_bdf[IO_APIC_ID(apic)].pin_setup) )
-+ {
-+ ASSERT(saved_mask);
-+ __io_apic_write(apic, reg, value);
-+ return;
-+ }
-+
- /* mask the interrupt while we change the intremap table */
- if ( !saved_mask )
- {
-@@ -262,7 +280,11 @@ void amd_iommu_ioapic_update_ire(
- }
-
- /* Update interrupt remapping entry */
-- update_intremap_entry_from_ioapic(bdf, iommu, &new_rte);
-+ update_intremap_entry_from_ioapic(
-+ bdf, iommu, &new_rte,
-+ test_and_set_bit(pin,
-+ ioapic_bdf[IO_APIC_ID(apic)].pin_setup) ? &old_rte
-+ : NULL);
-
- /* Forward write access to IO-APIC RTE */
- __io_apic_write(apic, reg, value);
-@@ -373,6 +395,12 @@ void amd_iommu_msi_msg_update_ire(
- return;
- }
-
-+ if ( msi_desc->remap_index >= 0 )
-+ update_intremap_entry_from_msi_msg(iommu, pdev, msi_desc, NULL);
-+
-+ if ( !msg )
-+ return;
-+
- update_intremap_entry_from_msi_msg(iommu, pdev, msi_desc, msg);
- }
-
---- a/xen/drivers/passthrough/amd/pci_amd_iommu.c
-+++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c
-@@ -195,6 +195,8 @@ int __init amd_iov_detect(void)
- {
- printk("AMD-Vi: Not overriding irq_vector_map setting\n");
- }
-+ if ( !amd_iommu_perdev_intremap )
-+ printk(XENLOG_WARNING "AMD-Vi: Using global interrupt remap table
is not recommended (see XSA-36)!\n");
- return scan_pci_devices();
- }
-
---- a/xen/drivers/passthrough/iommu.c
-+++ b/xen/drivers/passthrough/iommu.c
-@@ -49,7 +49,7 @@ bool_t __read_mostly iommu_qinval = 1;
- bool_t __read_mostly iommu_intremap = 1;
- bool_t __read_mostly iommu_hap_pt_share;
- bool_t __read_mostly amd_iommu_debug;
--bool_t __read_mostly amd_iommu_perdev_intremap;
-+bool_t __read_mostly amd_iommu_perdev_intremap = 1;
-
- static void __init parse_iommu_param(char *s)
- {
-@@ -78,6 +78,8 @@ static void __init parse_iommu_param(cha
- amd_iommu_debug = 1;
- else if ( !strcmp(s, "amd-iommu-perdev-intremap") )
- amd_iommu_perdev_intremap = 1;
-+ else if ( !strcmp(s, "amd-iommu-global-intremap") )
-+ amd_iommu_perdev_intremap = 0;
- else if ( !strcmp(s, "dom0-passthrough") )
- iommu_passthrough = 1;
- else if ( !strcmp(s, "dom0-strict") )
---- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
-+++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
-@@ -88,6 +88,11 @@ void amd_iommu_read_msi_from_ire(
- unsigned int amd_iommu_read_ioapic_from_ire(
- unsigned int apic, unsigned int reg);
-
-+extern struct ioapic_bdf {
-+ u16 bdf;
-+ unsigned long *pin_setup;
-+} ioapic_bdf[];
-+
- /* power management support */
- void amd_iommu_resume(void);
- void amd_iommu_suspend(void);
diff --git a/utils/xen/xsa-38.patch b/utils/xen/xsa-38.patch
deleted file mode 100644
index f4a5dc0..0000000
--- a/utils/xen/xsa-38.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff --git a/tools/ocaml/libs/xb/partial.ml b/tools/ocaml/libs/xb/partial.ml
-index 3558889..d4d1c7b 100644
---- a/tools/ocaml/libs/xb/partial.ml
-+++ b/tools/ocaml/libs/xb/partial.ml
-@@ -27,8 +27,15 @@ external header_size: unit -> int = "stub_header_size"
- external header_of_string_internal: string -> int * int * int * int
- = "stub_header_of_string"
-
-+let xenstore_payload_max = 4096 (* xen/include/public/io/xs_wire.h *)
-+
- let of_string s =
- let tid, rid, opint, dlen = header_of_string_internal s in
-+ (* A packet which is bigger than xenstore_payload_max is illegal.
-+ This will leave the guest connection is a bad state and will
-+ be hard to recover from without restarting the connection
-+ (ie rebooting the guest) *)
-+ let dlen = min xenstore_payload_max dlen in
- {
- tid = tid;
- rid = rid;
-@@ -38,6 +45,7 @@ let of_string s =
- }
-
- let append pkt s sz =
-+ if pkt.len > 4096 then failwith "Buffer.add: cannot grow buffer";
- Buffer.add_string pkt.buf (String.sub s 0 sz)
-
- let to_complete pkt =
-diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c
b/tools/ocaml/libs/xb/xs_ring_stubs.c
-index 00414c5..4888ac5 100644
---- a/tools/ocaml/libs/xb/xs_ring_stubs.c
-+++ b/tools/ocaml/libs/xb/xs_ring_stubs.c
-@@ -39,21 +39,23 @@ static int xs_ring_read(struct mmap_interface *interface,
- char *buffer, int len)
- {
- struct xenstore_domain_interface *intf = interface->addr;
-- XENSTORE_RING_IDX cons, prod;
-+ XENSTORE_RING_IDX cons, prod; /* offsets only */
- int to_read;
-
-- cons = intf->req_cons;
-- prod = intf->req_prod;
-+ cons = *(volatile uint32*)&intf->req_cons;
-+ prod = *(volatile uint32*)&intf->req_prod;
- xen_mb();
-+ cons = MASK_XENSTORE_IDX(cons);
-+ prod = MASK_XENSTORE_IDX(prod);
- if (prod == cons)
- return 0;
-- if (MASK_XENSTORE_IDX(prod) > MASK_XENSTORE_IDX(cons))
-+ if (prod > cons)
- to_read = prod - cons;
- else
-- to_read = XENSTORE_RING_SIZE - MASK_XENSTORE_IDX(cons);
-+ to_read = XENSTORE_RING_SIZE - cons;
- if (to_read < len)
- len = to_read;
-- memcpy(buffer, intf->req + MASK_XENSTORE_IDX(cons), len);
-+ memcpy(buffer, intf->req + cons, len);
- xen_mb();
- intf->req_cons += len;
- return len;
-@@ -66,8 +68,8 @@ static int xs_ring_write(struct mmap_interface *interface,
- XENSTORE_RING_IDX cons, prod;
- int can_write;
-
-- cons = intf->rsp_cons;
-- prod = intf->rsp_prod;
-+ cons = *(volatile uint32*)&intf->rsp_cons;
-+ prod = *(volatile uint32*)&intf->rsp_prod;
- xen_mb();
- if ( (prod - cons) >= XENSTORE_RING_SIZE )
- return 0;
diff --git a/utils/xen/xsa-41-1.patch b/utils/xen/xsa-41-1.patch
deleted file mode 100644
index 4ca750b..0000000
--- a/utils/xen/xsa-41-1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2c0331f4f7d241995452b99afaf0aab00493334a Mon Sep 17 00:00:00 2001
-From: Michael Contreras <michael AT inetric.com>
-Date: Wed, 5 Dec 2012 13:31:30 -0500
-Subject: [PATCH] e1000: Discard oversized packets based on SBP|LPE
-
-Discard packets longer than 16384 when !SBP to match the hardware behavior.
-
-Signed-off-by: Michael Contreras <michael AT inetric.com>
-Signed-off-by: Stefan Hajnoczi <stefanha AT redhat.com>
----
- hw/e1000.c | 7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/hw/e1000.c b/hw/e1000.c
-index 92fb00a..8fd1654 100644
---- a/tools/ioemu-qemu-xen/hw/e1000.c
-+++ b/tools/ioemu-qemu-xen/hw/e1000.c
-@@ -61,6 +61,8 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL);
-
- /* this is the size past which hardware will drop packets when setting
LPE=0 */
- #define MAXIMUM_ETHERNET_VLAN_SIZE 1522
-+/* this is the size past which hardware will drop packets when setting
LPE=1 */
-+#define MAXIMUM_ETHERNET_LPE_SIZE 16384
-
- /*
- * HW models:
-@@ -809,8 +811,9 @@ e1000_receive(NetClientState *nc, const uint8_t *buf,
size_t size)
- }
-
- /* Discard oversized packets if !LPE and !SBP. */
-- if (size > MAXIMUM_ETHERNET_VLAN_SIZE
-- && !(s->mac_reg[RCTL] & E1000_RCTL_LPE)
-+ if ((size > MAXIMUM_ETHERNET_LPE_SIZE ||
-+ (size > MAXIMUM_ETHERNET_VLAN_SIZE
-+ && !(s->mac_reg[RCTL] & E1000_RCTL_LPE)))
- && !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) {
- return size;
- }
---
-1.7.0.4
-
diff --git a/utils/xen/xsa-41.patch b/utils/xen/xsa-41.patch
deleted file mode 100644
index 64f60c5..0000000
--- a/utils/xen/xsa-41.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b0d9ffcd0251161c7c92f94804dcf599dfa3edeb Mon Sep 17 00:00:00 2001
-From: Michael Contreras <michael AT inetric.com>
-Date: Sun, 2 Dec 2012 20:11:22 -0800
-Subject: [PATCH] e1000: Discard packets that are too long if !SBP and !LPE
-
-The e1000_receive function for the e1000 needs to discard packets longer than
-1522 bytes if the SBP and LPE flags are disabled. The linux driver assumes
-this behavior and allocates memory based on this assumption.
-
-Signed-off-by: Michael Contreras <michael AT inetric.com>
-Signed-off-by: Anthony Liguori <aliguori AT us.ibm.com>
----
- hw/e1000.c | 10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/hw/e1000.c b/hw/e1000.c
-index cb7e7e8..5537ad2 100644
---- a/tools/ioemu-qemu-xen/hw/e1000.c
-+++ b/tools/ioemu-qemu-xen/hw/e1000.c
-@@ -59,6 +59,9 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL);
- #define PNPMMIO_SIZE 0x20000
- #define MIN_BUF_SIZE 60 /* Min. octets in an ethernet frame sans FCS */
-
-+/* this is the size past which hardware will drop packets when setting
LPE=0 */
-+#define MAXIMUM_ETHERNET_VLAN_SIZE 1522
-+
- /*
- * HW models:
- * E1000_DEV_ID_82540EM works with Windows and Linux
-@@ -805,6 +808,13 @@ e1000_receive(NetClientState *nc, const uint8_t *buf,
size_t size)
- size = sizeof(min_buf);
- }
-
-+ /* Discard oversized packets if !LPE and !SBP. */
-+ if (size > MAXIMUM_ETHERNET_VLAN_SIZE
-+ && !(s->mac_reg[RCTL] & E1000_RCTL_LPE)
-+ && !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) {
-+ return size;
-+ }
-+
- if (!receive_filter(s, buf, size))
- return size;
-
---
-1.7.0.4
-
diff --git a/video-libs/libdc1394/DETAILS b/video-libs/libdc1394/DETAILS
index 65a3a15..b0c79cd 100755
--- a/video-libs/libdc1394/DETAILS
+++ b/video-libs/libdc1394/DETAILS
@@ -1,10 +1,11 @@
SPELL=libdc1394
- VERSION=2.1.4
+ VERSION=2.2.1
+
SOURCE_HASH=sha512:e79370d4ac50f60535ef8b6f6ae21d5ede965812c775853e98c5c38e9bfc87929ef6e0d3737a20a443cd60c0225af18944bcba6d2cfb2ba858ac868bfb53c446
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
SOURCE_URL[1]=$KERNEL_URL/pub/linux/libs/ieee1394/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=LGPL
WEB_SITE=http://sourceforge.net/projects/libdc1394
ENTERED=20020125
diff --git a/video-libs/libdc1394/HISTORY b/video-libs/libdc1394/HISTORY
index 3e5b9bb..fe9973e 100644
--- a/video-libs/libdc1394/HISTORY
+++ b/video-libs/libdc1394/HISTORY
@@ -1,3 +1,6 @@
+2013-06-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.2.1
+
2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libusb => LIBUSB

diff --git a/video-libs/libdc1394/libdc1394-2.1.4.tar.gz.sig
b/video-libs/libdc1394/libdc1394-2.1.4.tar.gz.sig
deleted file mode 100644
index e3f8e62..0000000
Binary files a/video-libs/libdc1394/libdc1394-2.1.4.tar.gz.sig and /dev/null
differ
diff --git a/video-libs/libraw1394/DETAILS b/video-libs/libraw1394/DETAILS
index 30821d0..6c31947 100755
--- a/video-libs/libraw1394/DETAILS
+++ b/video-libs/libraw1394/DETAILS
@@ -1,7 +1,7 @@
SPELL=libraw1394
- VERSION=2.0.8
-
SOURCE_HASH=sha512:2b15a78aaf05ba3d833b5f898b3638b0a9229c754be48ffbe2b4c600a16078e1ef5425484005f0e935e4e3da127a136ee85af4ebdaf129a48e4153a59204d8fa
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=2.1.0
+
SOURCE_HASH=sha512:04295c2b4391b1c61cc1c65dbe5921f5e208bbb311104366d5756a82a6c53f1339c368fe76077318b22e2402fd8f679236606d0be4898728a9dba2d7a8989b9e
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=LGPL

WEB_SITE=https://ieee1394.wiki.kernel.org/index.php/Release_Notes_-_Libraries
diff --git a/video-libs/libraw1394/HISTORY b/video-libs/libraw1394/HISTORY
index eea18b0..a85c151 100644
--- a/video-libs/libraw1394/HISTORY
+++ b/video-libs/libraw1394/HISTORY
@@ -1,3 +1,6 @@
+2013-06-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: updated to 2.1.0
+
2012-02-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: updated to 2.0.8

diff --git a/x11-toolkits/lesstif/CONFLICTS b/x11-toolkits/lesstif/CONFLICTS
index dc718b4..c768abc 100755
--- a/x11-toolkits/lesstif/CONFLICTS
+++ b/x11-toolkits/lesstif/CONFLICTS
@@ -1 +1,2 @@
+conflicts motif &&
conflicts openmotif
diff --git a/x11-toolkits/motif/BUILD b/x11-toolkits/motif/BUILD
new file mode 100755
index 0000000..e9492e7
--- /dev/null
+++ b/x11-toolkits/motif/BUILD
@@ -0,0 +1,2 @@
+OPTS="$OPTS $MOTIF_OPTS" &&
+default_build
diff --git a/x11-toolkits/motif/CONFIGURE b/x11-toolkits/motif/CONFIGURE
new file mode 100755
index 0000000..138aa64
--- /dev/null
+++ b/x11-toolkits/motif/CONFIGURE
@@ -0,0 +1,7 @@
+config_query_option MOTIF_OPTS "Build Motif 2.2 compatibility?" n \
+ "--enable-motif22-compatibility" \
+ "--disable-motif22-compatibility" &&
+
+config_query_option MOTIF_OPTS "Build UTF-8 support?" y \
+ "--enable-utf-8" \
+ "--disable-utf-8"
diff --git a/x11-toolkits/motif/CONFLICTS b/x11-toolkits/motif/CONFLICTS
new file mode 100755
index 0000000..b1da0e9
--- /dev/null
+++ b/x11-toolkits/motif/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts openmotif &&
+conflicts lesstif
diff --git a/x11-toolkits/motif/DEPENDS b/x11-toolkits/motif/DEPENDS
new file mode 100755
index 0000000..127da9a
--- /dev/null
+++ b/x11-toolkits/motif/DEPENDS
@@ -0,0 +1,21 @@
+depends expat &&
+depends fontconfig &&
+depends freetype2 &&
+depends libtool &&
+depends libx11 &&
+depends libxt &&
+depends libxmu &&
+optional_depends libxft \
+ '--enable-xft' \
+ '--disable-xft' \
+ 'for XFT font anti-aliasing' &&
+
+optional_depends JPEG \
+ '--enable-jpeg' \
+ '--disable-jpeg' \
+ 'for JPEG image support' &&
+
+optional_depends libpng \
+ '--enable-png' \
+ '--disable-png' \
+ 'for PNG image support'
diff --git a/x11-toolkits/motif/DETAILS b/x11-toolkits/motif/DETAILS
new file mode 100755
index 0000000..8ca427e
--- /dev/null
+++ b/x11-toolkits/motif/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=motif
+ VERSION=2.3.4
+ SOURCE=$SPELL-$VERSION-src.tgz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_URL[0]=http://sourceforge.net/projects/motif/files/Motif%20${VERSION}%20Source%20Code/$SOURCE/download
+
SOURCE_HASH=sha512:fb1033caa68f25b93282fa6700d5b7856be217b3651072d86e7c93a747df5b31219230998eb93deae22a8fa698e816b1a30e52b3ae88ae1c01c1f0aac59a2af2
+ LICENSE[0]=LGPL
+ WEB_SITE=http://motif.ics.com/
+ ENTERED=20011019
+ SHORT="Motif is an LGPL release of the OSF/Motif GUI X11 toolkit."
+cat << EOF
+This is OpenMotif...
+EOF
diff --git a/x11-toolkits/motif/HISTORY b/x11-toolkits/motif/HISTORY
new file mode 100644
index 0000000..7c3379a
--- /dev/null
+++ b/x11-toolkits/motif/HISTORY
@@ -0,0 +1,3 @@
+2013-06-23 Remko van der Vossen <wich AT sourcemage.org>
+ * BUILD, CONFIGURE, CONFLICTS, DEPENDS, DETAILS, HISTORY, PRE_BUILD,
+ PROVIDES, UP_TRIGGERS, motif-autotools.patch: Created spell
diff --git a/x11-toolkits/motif/PRE_BUILD b/x11-toolkits/motif/PRE_BUILD
new file mode 100755
index 0000000..30fa9f7
--- /dev/null
+++ b/x11-toolkits/motif/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < "$SPELL_DIRECTORY/motif-autotools.patch" &&
+# don't build or install demos
+sed -i '/^demos/D' configure.ac &&
+sed -i 's/demos//;s/doc \\/doc/' Makefile.am &&
+rm -r demos &&
+#touch INSTALL NEWS AUTHORS COPYING &&
+autoreconf -f -i
diff --git a/x11-toolkits/motif/PROVIDES b/x11-toolkits/motif/PROVIDES
new file mode 100755
index 0000000..26ea992
--- /dev/null
+++ b/x11-toolkits/motif/PROVIDES
@@ -0,0 +1 @@
+MOTIF
diff --git a/x11-toolkits/motif/UP_TRIGGERS b/x11-toolkits/motif/UP_TRIGGERS
new file mode 100755
index 0000000..e7b696a
--- /dev/null
+++ b/x11-toolkits/motif/UP_TRIGGERS
@@ -0,0 +1,14 @@
+local OLD_SPELL_VERSION=""
+if spell_ok $SPELL; then
+ OLD_SPELL_VERSION="$(installed_version $SPELL)"
+ if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
+ message "This is a possibly incompatible update of $SPELL..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+ for each in $(show_up_depends $SPELL); do
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q "NEEDED.*libXm.so.3"; then
+ up_trigger $each cast_self
+ fi
+ done
+ fi
+fi
diff --git a/x11-toolkits/motif/motif-autotools.patch
b/x11-toolkits/motif/motif-autotools.patch
new file mode 100644
index 0000000..494351b
--- /dev/null
+++ b/x11-toolkits/motif/motif-autotools.patch
@@ -0,0 +1,1137 @@
+diff -Naur motif-2.3.4.orig/clients/mwm/Makefile.am
motif-2.3.4/clients/mwm/Makefile.am
+--- motif-2.3.4.orig/clients/mwm/Makefile.am 2012-10-22 16:50:39.000000000
+0200
++++ motif-2.3.4/clients/mwm/Makefile.am 2013-06-23 17:28:06.000000000
+0200
+@@ -11,7 +11,7 @@
+ bin_PROGRAMS = mwm
+ mwm_LDADD = ./WmWsmLib/libWsm.a ../../lib/Xm/libXm.la
+
+-INCLUDES = -DLARGECURSORS -DR2_COMPAT -DUNMAP_ON_RESTART \
++AM_CPPFLAGS = -DLARGECURSORS -DR2_COMPAT -DUNMAP_ON_RESTART \
+ -DCDE_INSTALLATION_TOP=\"@CDE_INSTALLATION_TOP@\" \
+ -DCDE_CONFIGURATION_TOP=\"@CDE_CONFIGURATION_TOP@\" \
+ -DBITMAPDIR=\"@INCDIR@/bitmaps\" \
+diff -Naur motif-2.3.4.orig/clients/mwm/WmWsmLib/Makefile.am
motif-2.3.4/clients/mwm/WmWsmLib/Makefile.am
+--- motif-2.3.4.orig/clients/mwm/WmWsmLib/Makefile.am 2012-10-22
16:50:39.000000000 +0200
++++ motif-2.3.4/clients/mwm/WmWsmLib/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -4,7 +4,7 @@
+
+ noinst_HEADERS = utm_send.h wsm_funcs.h wsm_proto.h
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+
+ libWsm_a_SOURCES = $(SRCS)
+
+diff -Naur motif-2.3.4.orig/clients/uil/Makefile.am
motif-2.3.4/clients/uil/Makefile.am
+--- motif-2.3.4.orig/clients/uil/Makefile.am 2012-10-22 16:50:39.000000000
+0200
++++ motif-2.3.4/clients/uil/Makefile.am 2013-06-23 17:28:06.000000000
+0200
+@@ -15,7 +15,7 @@
+
+ uil_LDADD = ../../lib/Mrm/libMrm.la ../../lib/Xm/libXm.la
+
+-INCLUDES = -DINCDIR=\"@INCDIR@\" \
++AM_CPPFLAGS = -DINCDIR=\"@INCDIR@\" \
+ -DLIBDIR=\"@LIBDIR@\" \
+ -I$(srcdir)/../../include \
+ -I$(srcdir)/../../lib \
+diff -Naur motif-2.3.4.orig/clients/xmbind/Makefile.am
motif-2.3.4/clients/xmbind/Makefile.am
+--- motif-2.3.4.orig/clients/xmbind/Makefile.am 2012-10-22
16:50:39.000000000 +0200
++++ motif-2.3.4/clients/xmbind/Makefile.am 2013-06-23 17:28:06.000000000
+0200
+@@ -4,4 +4,4 @@
+
+ LDADD = ../../lib/Xm/libXm.la
+
+-INCLUDES = -I$(srcdir)/../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/config/util/Makefile.am
motif-2.3.4/config/util/Makefile.am
+--- motif-2.3.4.orig/config/util/Makefile.am 2012-10-22 16:50:39.000000000
+0200
++++ motif-2.3.4/config/util/Makefile.am 2013-06-23 17:28:06.000000000
+0200
+@@ -7,7 +7,7 @@
+ mkdirhier.man mkdirhier.sh mkshadow syminst.sh x11mf.sh \
+ xmkmf.cpp xmkmf.man Makefile.ini
+
+-INCLUDES = ${X_CFLAGS}
++AM_CPPFLAGS = ${X_CFLAGS}
+ noinst_PROGRAMS = makestrs
+
+
+diff -Naur motif-2.3.4.orig/configure.ac motif-2.3.4/configure.ac
+--- motif-2.3.4.orig/configure.ac 2012-10-22 16:50:39.000000000 +0200
++++ motif-2.3.4/configure.ac 2013-06-23 17:28:17.000000000 +0200
+@@ -1,8 +1,13 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_INIT
++AC_PREREQ(2.59)
++AC_INIT([motif], [2.3.4])
+ AC_CONFIG_SRCDIR([lib/Xm/Form.c])
+-AC_PREREQ(2.52)
+ AC_CONFIG_AUX_DIR(.)
++AC_CANONICAL_TARGET
++
++AM_INIT_AUTOMAKE([foreign no-define])
++dnl AM_MAINTAINER_MODE
++
+ AC_CHECK_FILE(/usr/X/include/X11/X.h,
+ AC_PREFIX_DEFAULT(/usr/X),
+ AC_PREFIX_DEFAULT(/usr))
+@@ -10,9 +15,6 @@
+ AC_PREFIX_DEFAULT(/usr/X11R6),
+ AC_PREFIX_DEFAULT(/usr))
+
+-dnl AM_MAINTAINER_MODE
+-AC_CANONICAL_TARGET
+-
+ dnl The version of the Motif libraries
+ CURRENT=4
+ REVISION=4
+@@ -21,9 +23,6 @@
+ AC_SUBST(REVISION)
+ AC_SUBST(AGE)
+
+-dnl This is really dumb but it seems to be bug
+-AM_INIT_AUTOMAKE(motif,2.3.4,no-define)
+-
+ LIBTOOL_VERSION=$CURRENT:$REVISION:$AGE
+
+ dnl
+@@ -31,12 +30,11 @@
+ dnl
+ dnl AC_DISABLE_STATIC
+
+-AM_CONFIG_HEADER(include/config.h lib/Xm/Xm.h)
++AC_CONFIG_HEADERS(include/config.h lib/Xm/Xm.h)
+
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_CPP
+-AM_PROG_CC_STDC
+ AM_PROG_LIBTOOL
+
+ AC_EXEEXT
+diff -Naur motif-2.3.4.orig/configure.ac.orig motif-2.3.4/configure.ac.orig
+--- motif-2.3.4.orig/configure.ac.orig 1970-01-01 01:00:00.000000000 +0100
++++ motif-2.3.4/configure.ac.orig 2013-06-23 17:28:06.000000000 +0200
+@@ -0,0 +1,400 @@
++dnl Process this file with autoconf to produce a configure script.
++AC_PREREQ(2.59)
++AC_INIT([motif], [2.3.4])
++AC_CONFIG_SRCDIR([lib/Xm/Form.c])
++AC_CONFIG_AUX_DIR(.)
++AC_CANONICAL_TARGET
++
++AM_INIT_AUTOMAKE([foreign no-define])
++dnl AM_MAINTAINER_MODE
++
++AC_CHECK_FILE(/usr/X/include/X11/X.h,
++ AC_PREFIX_DEFAULT(/usr/X),
++ AC_PREFIX_DEFAULT(/usr))
++AC_CHECK_FILE(/usr/X11R6/include/X11/X.h,
++ AC_PREFIX_DEFAULT(/usr/X11R6),
++ AC_PREFIX_DEFAULT(/usr))
++
++dnl The version of the Motif libraries
++CURRENT=4
++REVISION=4
++AGE=0
++AC_SUBST(CURRENT)
++AC_SUBST(REVISION)
++AC_SUBST(AGE)
++
++LIBTOOL_VERSION=$CURRENT:$REVISION:$AGE
++
++dnl
++dnl Override a default in libtool.
++dnl
++dnl AC_DISABLE_STATIC
++
++AM_CONFIG_HEADER(include/config.h lib/Xm/Xm.h)
++
++dnl Checks for programs.
++AC_PROG_CC
++AC_PROG_CPP
++AM_PROG_CC_STDC
++AM_PROG_LIBTOOL
++
++AC_EXEEXT
++
++dnl AC_PROG_YACC
++dnl Do this the old fashioned way. 'bison -y' doesn't cut it
++AC_CHECK_PROGS(YACC, byacc, yacc)
++
++dnl AC_PROG_SPLINT
++AC_CHECK_PROGS(SPLINT, splint)
++if test x$SPLINT = x
++then
++ AC_MSG_WARN([No splint is dound])
++fi
++
++AM_PROG_LEX
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_PROG_MAKE_SET
++
++
++dnl Checks for libraries.
++
++AC_PATH_X
++AC_PATH_XTRA
++LT_LIB_XTHREADS
++
++dnl Checks for Xos_r.h
++
++AC_CHECK_HEADERS([X11/Xos_r.h])
++AC_CHECK_HEADERS([X11/Xpoll.h])
++
++dnl Compile in EditRes support if we can find Xmu
++
++save_LIBS="$LIBS"
++save_CFLAGS="$CFLAGS"
++LIBS="$X_LIBS $LIBS"
++CFLAGS="$X_CFLAGS $CFLAGS"
++AC_CHECK_HEADERS(X11/Xmu/Editres.h,
++AC_CHECK_LIB(Xmu, _XEditResCheckMessages,
++X_XMU=-lXmu
++AC_DEFINE(HAVE_LIBXMU, 1, This System has libXmu)
++, X_XMU="", -lXt -lX11)
++AC_CHECK_LIB(Xmu,XmuNCopyISOLatin1Lowered ,
++AC_DEFINE(HAVE_XMU_N_COPY_ISO,1,Have XmuNCopyISOLatin1Lowered)
++, , -lXt -lX11)
++,,[[#include <X11/Intrinsic.h>]]
++)
++
++
++AC_SUBST(X_XMU)
++LIBS="$save_LIBS"
++CFLAGS="$save_CFLAGS"
++AM_CONDITIONAL(OM_XMU, test x$X_XMU != x)
++
++dnl Checks for header files.
++AC_HEADER_DIRENT
++AC_HEADER_STDC
++AC_HEADER_SYS_WAIT
++AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/malloc.h strings.h
sys/file.h sys/time.h unistd.h wchar.h)
++AC_CHECK_HEADERS(wctype.h, AC_DEFINE(HAS_WIDECHAR_FUNCTIONS,1,System
supports wchar))
++AC_CHECK_HEADER(langinfo.h,,AC_DEFINE(CSRG_BASED,1,System Has langinfo.h))
++AC_CHECK_HEADER(X11/Xos_r.h,,AC_DEFINE(NEED_XOS_R_H,1,System Missing
Xos_r.h))
++AC_CHECK_HEADER(X11/Xpoll.h,,AC_DEFINE(NEED_XPOLL_H,1,system Missing
X11/Xpoll.h))
++dnl Checks for typedefs, structures, and compiler characteristics.
++AC_C_CONST
++AC_TYPE_MODE_T
++AC_TYPE_OFF_T
++AC_TYPE_PID_T
++AC_TYPE_SIZE_T
++AC_HEADER_TIME
++AC_STRUCT_TM
++AC_TYPE_UID_T
++
++dnl Checks for library functions.
++AC_FUNC_ALLOCA
++AC_FUNC_MEMCMP
++AC_FUNC_SETPGRP
++AC_TYPE_SIGNAL
++AC_FUNC_STRCOLL
++AC_FUNC_STRFTIME
++AC_FUNC_FORK([])
++AC_FUNC_VPRINTF
++AM_FUNC_VOID_SPRINTF
++AC_CHECK_FUNCS(wcslen wcscpy wcsncpy wcschr wcscat wcsncat getcwd
gettimeofday mkdir re_comp regcmp select strcspn strerror strstr strtod
strtol uname)
++AC_CHECK_FUNCS(strdup,,AC_DEFINE(NEED_STRDUP, 1, no strdup))
++AC_CHECK_FUNCS(strcasecmp,,AC_DEFINE(NEED_STRCASECMP, 1, no strcasecmp))
++AC_CHECK_FUNCS(putenv,,AC_DEFINE(NO_PUTENV, 1, No PUTENV))
++AC_CHECK_FUNCS(regcomp,,AC_DEFINE(NO_REGCOMP, 1, no regcmp))
++AC_CHECK_FUNCS(memmove,,AC_DEFINE(NO_MEMMOVE, 1, no memmove))
++AC_CHECK_TYPE(XICProc,,AC_DEFINE(NO_XICPROC, 1, XICProc isn't defined),
[#include <X11/Xlib.h>])
++
++AC_ARG_ENABLE(message-catalog, [ --enable-message-catalog
++ Enable building of the message catalog
(default=no)])
++if test "$enable_message_catalog" != "yes"
++then
++ AC_DEFINE(NO_MESSAGE_CATALOG, 1, No Defined Message Catalog)
++fi
++AM_CONDITIONAL(MessageCatalog, test x$enable_message_catalog = xyes)
++
++AC_ARG_ENABLE(themes, [ --enable-themes Enable themes
(default=no)])
++if test "$enable_themes" = "yes"
++then
++ if test -f $srcdir/lib/Xm/Theme.h
++ then
++ AC_DEFINE(USE_XMTHEMES, 1, "Use XmThemes")
++ XMTHEME_DIST = "Theme.h ThemeP.h DynLibP.h Theme.c DynLib.c"
++ else
++ AC_MSG_WARN([--enable-themes specified, but I don't have the code.
Disabled])
++ enable_themes="no"
++ fi
++fi
++AC_SUBST(XMTHEME_DIST)
++AM_CONDITIONAL(OM_XMTHEMES, test "$enable_themes" = "yes")
++
++AC_ARG_ENABLE(debug-themes, [ --enable-debug-themes Enable themes
debugging (default=no)])
++if test "$enable_themes" = "yes"
++then
++ if test "$enable_debug_themes" = "yes"
++ then
++ AC_DEFINE(DEBUGTHEMES, 1, "Debug Themes")
++ fi
++fi
++
++if test x$GCC = xyes
++then
++ CFLAGS="$CFLAGS -Wall -g -fno-strict-aliasing -Wno-unused -Wno-comment"
++ if test ` $CC -dumpversion | sed -e 's/\(^.\).*/\1/'` = "4" ; then
++ CFLAGS="$CFLAGS -fno-tree-ter"
++ fi
++fi
++AC_DEFINE(NO_OL_COMPAT, 1, "No OL Compatability")
++
++CDE_INSTALLATION_TOP="\${prefix}/dt"
++AC_SUBST(CDE_INSTALLATION_TOP)
++
++CDE_CONFIGURATION_TOP="\${prefix}/etc/dt"
++AC_SUBST(CDE_CONFIGURATION_TOP)
++
++LIBDIR="${libdir}/X11"
++AC_SUBST(LIBDIR)
++
++MWMRCDIR="${libdir}/X11"
++AC_SUBST(MWMRCDIR)
++
++INCDIR="${includedir}/X11"
++AC_SUBST(INCDIR)
++
++XMBINDDIR_FALLBACK="${libdir}/X11/bindings"
++AC_SUBST(XMBINDDIR_FALLBACK)
++
++RM="rm -f"
++AC_SUBST(RM)
++
++AC_ARG_ENABLE(motif22-compatibility, [ --disable-motif22-compatibility
++ Disable binary compatibility with OpenMotif 2.2])
++AC_ARG_ENABLE(utf8, [ --disable-utf8
++ Disable UTF-8 support])
++
++case "$host_os" in
++ freebsd*) CFLAGS="$CFLAGS -DCSRG_BASED -DXNO_MTSAFE_API
-DXNO_MTSAFE_PWDAPI";
++ LDFLAGS="$LDFLAGS -L/usr/local/lib";;
++ cygwin*) CFLAGS="$CFLAGS -DXNO_MTSAFE_DIRENTDAPI";;
++ solaris* | sunos*) X_LIBS="$X_LIBS -L/usr/X/lib" &&
++ if test x$enable_motif22_compatibility = x
++ then
++ enable_motif22_compatibility="no"
++ fi;
++ if test x$enable_utf8 = x
++ then
++ enable_utf8="no"
++ fi;
++ if test x$enable_xft = x
++ then
++ enable_xft="no"
++ fi;;
++esac
++
++if test x$enable_motif22_compatibility = x
++then
++ enable_motif22_compatibility="yes"
++fi
++
++if test "$enable_motif22_compatibility" = "yes"
++then
++ AC_DEFINE([OM22_COMPATIBILITY], [1], [Compatibility with OpenMotif 2.2])
++ OM22_COMPATIBILITY_FALSE=!
++ OM22_COMPATIBILITY_TRUE=
++else
++ OM22_COMPATIBILITY_FALSE=
++ OM22_COMPATIBILITY_TRUE=!
++fi
++AC_SUBST(OM22_COMPATIBILITY_FALSE)
++AC_SUBST(OM22_COMPATIBILITY_TRUE)
++
++if test x$enable_utf8 = x
++then
++ enable_utf8="yes"
++fi
++
++if test "$enable_utf8" = "yes"
++then
++ AC_DEFINE([UTF8_SUPPORTED], [1], [UTF8 is supported])
++ AC_SEARCH_LIBS([iconv_open], [iconv], ,
++ AC_SEARCH_LIBS([libiconv_open], [iconv]))
++fi
++
++AC_ARG_ENABLE(printing, [ --disable-printing
++ Disable printing support])
++
++if test x$enable_printing = x
++then
++ enable_printing="yes"
++fi
++
++if test "$enable_printing" = "yes"
++then
++ AC_MSG_CHECKING([for libXp])
++ AC_CHECK_HEADERS(X11/extensions/Print.h,
++ AC_CHECK_LIB(Xp, XpCreateContext, ,enable_printing="no"),
++ enable_printing="no")
++fi
++
++if test "$enable_printing" = "yes"
++then
++ LIB_XP=-lXp
++ AC_DEFINE([PRINTING_SUPPORTED], [1], [Printing is supported])
++ PRINTING_SUPPORTED_FALSE=!
++ PRINTING_SUPPORTED_TRUE=
++else
++ LIB_XP=
++ PRINTING_SUPPORTED_FALSE=
++ PRINTING_SUPPORTED_TRUE=!
++fi
++AC_SUBST(PRINTING_SUPPORTED_FALSE)
++AC_SUBST(PRINTING_SUPPORTED_TRUE)
++
++AM_CONDITIONAL(PRINTING, test "$enable_printing" = "yes")
++AC_SUBST(LIB_XP)
++
++AC_FIND_XFT
++AC_IMAGE_SUPPORT
++
++
++
++# AM_CONDITIONAL(Motif22Compatibility, test x$enable_motif22_compatibility
= xyes)
++
++AC_CONFIG_FILES([Makefile \
++bindings/Makefile \
++bitmaps/Makefile \
++clients/Makefile \
++clients/mwm/Makefile \
++clients/mwm/WmWsmLib/Makefile \
++clients/uil/Makefile \
++clients/xmbind/Makefile \
++config/Makefile \
++config/cf/Makefile \
++config/imake/Makefile \
++config/util/Makefile \
++config/makedepend/Makefile \
++include/Makefile \
++include/Dt/Makefile \
++lib/Makefile \
++lib/Xm/Makefile \
++lib/Mrm/Makefile \
++localized/Makefile \
++localized/util/Makefile \
++doc/Makefile \
++doc/man/Makefile \
++doc/man/man1/Makefile \
++doc/man/man3/Makefile \
++doc/man/man4/Makefile \
++doc/man/man5/Makefile \
++tools/Makefile \
++tools/wml/Makefile \
++demos/Makefile \
++demos/lib/Makefile \
++demos/lib/Xmd/Makefile \
++demos/lib/Wsm/Makefile \
++demos/lib/Exm/Makefile \
++demos/lib/Exm/wml/Makefile \
++demos/programs/Makefile \
++demos/programs/Exm/Makefile \
++demos/programs/Exm/app_in_c/Makefile \
++demos/programs/Exm/app_in_uil/Makefile \
++demos/programs/Exm/simple_app/Makefile \
++demos/programs/airport/Makefile \
++demos/programs/animate/Makefile \
++demos/programs/drag_and_drop/Makefile \
++demos/programs/draw/Makefile \
++demos/programs/earth/Makefile \
++demos/programs/filemanager/Makefile \
++demos/programs/fileview/Makefile \
++demos/programs/getsubres/Makefile \
++demos/programs/hellomotif/Makefile \
++demos/programs/hellomotifi18n/Makefile \
++demos/programs/hellomotifi18n/C/Makefile \
++demos/programs/hellomotifi18n/C/uid/Makefile \
++demos/programs/hellomotifi18n/english/Makefile \
++demos/programs/hellomotifi18n/english/uid/Makefile \
++demos/programs/hellomotifi18n/french/Makefile \
++demos/programs/hellomotifi18n/french/uid/Makefile \
++demos/programs/hellomotifi18n/hebrew/Makefile \
++demos/programs/hellomotifi18n/hebrew/uid/Makefile \
++demos/programs/hellomotifi18n/japan/Makefile \
++demos/programs/hellomotifi18n/japan/uid/Makefile \
++demos/programs/hellomotifi18n/japanese/Makefile \
++demos/programs/hellomotifi18n/japanese/uid/Makefile \
++demos/programs/hellomotifi18n/swedish/Makefile \
++demos/programs/hellomotifi18n/swedish/uid/Makefile \
++demos/programs/i18ninput/Makefile \
++demos/programs/panner/Makefile \
++demos/programs/periodic/Makefile \
++demos/programs/piano/Makefile \
++demos/programs/popups/Makefile \
++demos/programs/sampler2_0/Makefile \
++demos/programs/setdate/Makefile \
++demos/programs/todo/Makefile \
++demos/programs/workspace/Makefile \
++demos/programs/tooltips/Makefile \
++demos/programs/FontSel/Makefile \
++demos/programs/ButtonBox/Makefile \
++demos/programs/ColorSel/Makefile \
++demos/programs/Column/Makefile \
++demos/programs/Combo2/Makefile \
++demos/programs/Ext18List/Makefile \
++demos/programs/Ext18List/pixmaps/Makefile \
++demos/programs/IconB/Makefile \
++demos/programs/Outline/Makefile \
++demos/programs/Paned/Makefile \
++demos/programs/TabStack/Makefile \
++demos/programs/Tree/Makefile \
++demos/programs/pixmaps/Makefile \
++demos/unsupported/Makefile \
++demos/unsupported/Exm/Makefile \
++demos/unsupported/aicon/Makefile \
++demos/unsupported/dainput/Makefile \
++demos/unsupported/dogs/Makefile \
++demos/unsupported/hellomotif/Makefile \
++demos/unsupported/motifshell/Makefile \
++demos/unsupported/uilsymdump/Makefile \
++demos/unsupported/xmapdef/Makefile \
++demos/unsupported/xmfonts/Makefile \
++demos/unsupported/xmforc/Makefile \
++demos/unsupported/xmform/Makefile \
++demos/doc/Makefile \
++demos/doc/programGuide/Makefile \
++demos/doc/programGuide/ch05/Makefile \
++demos/doc/programGuide/ch05/Scale/Makefile \
++demos/doc/programGuide/ch06/Makefile \
++demos/doc/programGuide/ch06/spin_box/Makefile \
++demos/doc/programGuide/ch06/combo_box/Makefile \
++demos/doc/programGuide/ch08/Makefile \
++demos/doc/programGuide/ch08/Notebook/Makefile \
++demos/doc/programGuide/ch08/Container/Makefile \
++demos/doc/programGuide/ch16/Makefile \
++demos/doc/programGuide/ch17/Makefile \
++demos/doc/programGuide/ch17/simple_drop/Makefile \
++demos/doc/programGuide/ch17/simple_drag/Makefile \
++lib/Xm/xmstring.list \
++])
++AC_OUTPUT
+diff -Naur motif-2.3.4.orig/demos/doc/programGuide/ch05/Scale/Makefile.am
motif-2.3.4/demos/doc/programGuide/ch05/Scale/Makefile.am
+--- motif-2.3.4.orig/demos/doc/programGuide/ch05/Scale/Makefile.am
2012-10-22 16:50:38.000000000 +0200
++++ motif-2.3.4/demos/doc/programGuide/ch05/Scale/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -6,6 +6,6 @@
+
+ tic_mark_SOURCES = tic_mark.c interface.c
+
+-INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib
-I$(top_srcdir)/demos/lib $(X_CFLAGS)
++AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
-I$(top_srcdir)/demos/lib $(X_CFLAGS)
+
+ LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd
$(top_builddir)/lib/Xm/libXm.la
+diff -Naur
motif-2.3.4.orig/demos/doc/programGuide/ch06/combo_box/Makefile.am
motif-2.3.4/demos/doc/programGuide/ch06/combo_box/Makefile.am
+--- motif-2.3.4.orig/demos/doc/programGuide/ch06/combo_box/Makefile.am
2012-10-22 16:50:38.000000000 +0200
++++ motif-2.3.4/demos/doc/programGuide/ch06/combo_box/Makefile.am
2013-06-23 17:28:06.000000000 +0200
+@@ -7,6 +7,6 @@
+ combo_box_SOURCES = combo_box.c interface.c
+
+
+-INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib
-I$(top_srcdir)/demos/lib $(X_CFLAGS)
++AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
-I$(top_srcdir)/demos/lib $(X_CFLAGS)
+
+ LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd
$(top_builddir)/lib/Xm/libXm.la
+diff -Naur motif-2.3.4.orig/demos/doc/programGuide/ch06/spin_box/Makefile.am
motif-2.3.4/demos/doc/programGuide/ch06/spin_box/Makefile.am
+--- motif-2.3.4.orig/demos/doc/programGuide/ch06/spin_box/Makefile.am
2012-10-22 16:50:38.000000000 +0200
++++ motif-2.3.4/demos/doc/programGuide/ch06/spin_box/Makefile.am
2013-06-23 17:28:06.000000000 +0200
+@@ -7,6 +7,6 @@
+ spin_box_SOURCES = spin_box.c interface.c
+
+
+-INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib
-I$(top_srcdir)/demos/lib $(X_CFLAGS)
++AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
-I$(top_srcdir)/demos/lib $(X_CFLAGS)
+
+ LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd
$(top_builddir)/lib/Xm/libXm.la
+diff -Naur
motif-2.3.4.orig/demos/doc/programGuide/ch08/Container/Makefile.am
motif-2.3.4/demos/doc/programGuide/ch08/Container/Makefile.am
+--- motif-2.3.4.orig/demos/doc/programGuide/ch08/Container/Makefile.am
2012-10-22 16:50:38.000000000 +0200
++++ motif-2.3.4/demos/doc/programGuide/ch08/Container/Makefile.am
2013-06-23 17:28:06.000000000 +0200
+@@ -6,6 +6,6 @@
+
+ container_SOURCES = container.c interface.c
+
+-INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib
-I$(top_srcdir)/demos/lib $(X_CFLAGS)
++AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
-I$(top_srcdir)/demos/lib $(X_CFLAGS)
+
+ LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd
$(top_builddir)/lib/Xm/libXm.la
+diff -Naur motif-2.3.4.orig/demos/doc/programGuide/ch08/Notebook/Makefile.am
motif-2.3.4/demos/doc/programGuide/ch08/Notebook/Makefile.am
+--- motif-2.3.4.orig/demos/doc/programGuide/ch08/Notebook/Makefile.am
2012-10-22 16:50:38.000000000 +0200
++++ motif-2.3.4/demos/doc/programGuide/ch08/Notebook/Makefile.am
2013-06-23 17:28:06.000000000 +0200
+@@ -6,6 +6,6 @@
+
+ notebook_SOURCES = interface.c notebook.c
+
+-INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib
-I$(top_srcdir)/demos/lib $(X_CFLAGS)
++AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
-I$(top_srcdir)/demos/lib $(X_CFLAGS)
+
+ LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd
$(top_builddir)/lib/Xm/libXm.la
+diff -Naur motif-2.3.4.orig/demos/doc/programGuide/ch16/Makefile.am
motif-2.3.4/demos/doc/programGuide/ch16/Makefile.am
+--- motif-2.3.4.orig/demos/doc/programGuide/ch16/Makefile.am 2012-10-22
16:50:39.000000000 +0200
++++ motif-2.3.4/demos/doc/programGuide/ch16/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -7,6 +7,6 @@
+ UTMXmText_SOURCES = UTMXmText.c
+
+
+-INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib
-I$(top_srcdir)/demos/lib $(X_CFLAGS)
++AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
-I$(top_srcdir)/demos/lib $(X_CFLAGS)
+
+ LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd
$(top_builddir)/lib/Xm/libXm.la
+diff -Naur
motif-2.3.4.orig/demos/doc/programGuide/ch17/simple_drag/Makefile.am
motif-2.3.4/demos/doc/programGuide/ch17/simple_drag/Makefile.am
+--- motif-2.3.4.orig/demos/doc/programGuide/ch17/simple_drag/Makefile.am
2012-10-22 16:50:38.000000000 +0200
++++ motif-2.3.4/demos/doc/programGuide/ch17/simple_drag/Makefile.am
2013-06-23 17:28:06.000000000 +0200
+@@ -7,6 +7,6 @@
+ simple_drag_SOURCES = simple_drag.c
+
+
+-INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib
-I$(top_srcdir)/demos/lib $(X_CFLAGS)
++AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
-I$(top_srcdir)/demos/lib $(X_CFLAGS)
+
+ LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd
$(top_builddir)/lib/Xm/libXm.la
+diff -Naur
motif-2.3.4.orig/demos/doc/programGuide/ch17/simple_drop/Makefile.am
motif-2.3.4/demos/doc/programGuide/ch17/simple_drop/Makefile.am
+--- motif-2.3.4.orig/demos/doc/programGuide/ch17/simple_drop/Makefile.am
2012-10-22 16:50:38.000000000 +0200
++++ motif-2.3.4/demos/doc/programGuide/ch17/simple_drop/Makefile.am
2013-06-23 17:28:06.000000000 +0200
+@@ -7,6 +7,6 @@
+ simple_drop_SOURCES = simple_drop.c
+
+
+-INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib
-I$(top_srcdir)/demos/lib $(X_CFLAGS)
++AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
-I$(top_srcdir)/demos/lib $(X_CFLAGS)
+
+ LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd
$(top_builddir)/lib/Xm/libXm.la
+diff -Naur motif-2.3.4.orig/demos/lib/Exm/Makefile.am
motif-2.3.4/demos/lib/Exm/Makefile.am
+--- motif-2.3.4.orig/demos/lib/Exm/Makefile.am 2012-10-22 16:50:38.000000000
+0200
++++ motif-2.3.4/demos/lib/Exm/Makefile.am 2013-06-23 17:28:06.000000000
+0200
+@@ -4,7 +4,7 @@
+
+ noinst_LIBRARIES = libExm.a libExmMrm.a
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/.. -I$(top_builddir)/lib
${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(srcdir)/.. -I$(top_builddir)/lib
${X_CFLAGS}
+
+ CLEANFILES = Grid.E
+
+diff -Naur motif-2.3.4.orig/demos/lib/Exm/wml/Makefile.am
motif-2.3.4/demos/lib/Exm/wml/Makefile.am
+--- motif-2.3.4.orig/demos/lib/Exm/wml/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/lib/Exm/wml/Makefile.am 2013-06-23 17:28:06.000000000
+0200
+@@ -9,7 +9,7 @@
+
+ WMLDIR = $(top_srcdir)/tools/wml
+
+-INCLUDES = -I$(top_srcdir)/lib \
++AM_CPPFLAGS = -I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
+ -I$(top_srcdir)/include \
+ -I$(srcdir)/../.. \
+@@ -30,7 +30,7 @@
+ ./wmldbcreate -o $@
+
+
+-# INCLUDES = -I. -I$(INCLUDESRC) -I$(MINCLUDESRC) -I$(MLIBSRC) -I../../.
-I$(MTOP)/include
++# AM_CPPFLAGS = -I. -I$(INCLUDESRC) -I$(MINCLUDESRC) -I$(MLIBSRC) -I../../.
-I$(MTOP)/include
+ # DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
+ # LOCAL_LIBRARIES = XmClientLibs
+ #
+diff -Naur motif-2.3.4.orig/demos/lib/Wsm/Makefile.am
motif-2.3.4/demos/lib/Wsm/Makefile.am
+--- motif-2.3.4.orig/demos/lib/Wsm/Makefile.am 2012-10-22 16:50:38.000000000
+0200
++++ motif-2.3.4/demos/lib/Wsm/Makefile.am 2013-06-23 17:28:06.000000000
+0200
+@@ -6,4 +6,4 @@
+
+ noinst_HEADERS = wsm_funcs.h wsm_proto.h utm_send.h
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/lib/Xmd/Makefile.am
motif-2.3.4/demos/lib/Xmd/Makefile.am
+--- motif-2.3.4.orig/demos/lib/Xmd/Makefile.am 2012-10-22 16:50:38.000000000
+0200
++++ motif-2.3.4/demos/lib/Xmd/Makefile.am 2013-06-23 17:28:06.000000000
+0200
+@@ -14,7 +14,7 @@
+
+ LDADD = libXmd.a ../../../lib/Xm/libXm.la
+
+-INCLUDES = -I$(top_builddir)/lib -I$(srcdir)/../../../lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(top_builddir)/lib -I$(srcdir)/../../../lib ${X_CFLAGS}
+
+ EXTRA_DIST = Imakefile
+
+diff -Naur motif-2.3.4.orig/demos/programs/ButtonBox/Makefile.am
motif-2.3.4/demos/programs/ButtonBox/Makefile.am
+--- motif-2.3.4.orig/demos/programs/ButtonBox/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/ButtonBox/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -10,4 +10,4 @@
+ TOPDIR = ../../..
+ LDADD = $(TOPDIR)/lib/Xm/libXm.la
+
+-INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/ColorSel/Makefile.am
motif-2.3.4/demos/programs/ColorSel/Makefile.am
+--- motif-2.3.4.orig/demos/programs/ColorSel/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/ColorSel/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -9,4 +9,4 @@
+ data_DATA = $(colordemo_SOURCES) $(EXTRA_DIST)
+ LDADD = $(TOPDIR)/lib/Xm/libXm.la
+ TOPDIR = ../../..
+-INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/Column/Makefile.am
motif-2.3.4/demos/programs/Column/Makefile.am
+--- motif-2.3.4.orig/demos/programs/Column/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/Column/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -9,4 +9,4 @@
+ data_DATA = $(EXTRA_DIST) $(column_SOURCES)
+ TOPDIR = ../../..
+ LDADD = $(TOPDIR)/lib/Xm/libXm.la
+-INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/Combo2/Makefile.am
motif-2.3.4/demos/programs/Combo2/Makefile.am
+--- motif-2.3.4.orig/demos/programs/Combo2/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/Combo2/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -9,4 +9,4 @@
+ data_DATA = $(EXTRA_DIST) $(combo_SOURCES)
+ TOPDIR = ../../..
+ LDADD = $(TOPDIR)/lib/Xm/libXm.la
+-INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/Exm/app_in_c/Makefile.am
motif-2.3.4/demos/programs/Exm/app_in_c/Makefile.am
+--- motif-2.3.4.orig/demos/programs/Exm/app_in_c/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/Exm/app_in_c/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -9,7 +9,7 @@
+
+ EXTRA_DIST = exm_in_c.man Imakefile
+
+-INCLUDES = -I$(srcdir)/../../../../lib \
++AM_CPPFLAGS = -I$(srcdir)/../../../../lib \
+ -I$(srcdir)/../../../lib \
+ -I$(top_builddir)/lib \
+ ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/Exm/app_in_uil/Makefile.am
motif-2.3.4/demos/programs/Exm/app_in_uil/Makefile.am
+--- motif-2.3.4.orig/demos/programs/Exm/app_in_uil/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/Exm/app_in_uil/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -10,7 +10,7 @@
+ LDADD = -L../../../lib/Exm -lExmMrm -lExm $(top_builddir)/lib/Mrm/libMrm.la
+
+
+-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/lib -I../../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/lib -I../../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
+
+ SUFFIXES = .uil .uid
+
+diff -Naur motif-2.3.4.orig/demos/programs/Exm/simple_app/Makefile.am
motif-2.3.4/demos/programs/Exm/simple_app/Makefile.am
+--- motif-2.3.4.orig/demos/programs/Exm/simple_app/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/Exm/simple_app/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -10,7 +10,7 @@
+
+ EXTRA_DIST = simpleDemo.man README Imakefile
+
+-INCLUDES = -I$(srcdir)/../../../../lib \
++AM_CPPFLAGS = -I$(srcdir)/../../../../lib \
+ -I$(srcdir)/../../../lib \
+ -I$(top_builddir)/lib \
+ ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/Ext18List/Makefile.am
motif-2.3.4/demos/programs/Ext18List/Makefile.am
+--- motif-2.3.4.orig/demos/programs/Ext18List/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/Ext18List/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -12,4 +12,4 @@
+ TOPDIR = ../../..
+ LDADD = $(TOPDIR)/lib/Xm/libXm.la
+
+-INCLUDES = -I$(TOPDIR)/lib -I.. -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(TOPDIR)/lib -I.. -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/FontSel/Makefile.am
motif-2.3.4/demos/programs/FontSel/Makefile.am
+--- motif-2.3.4.orig/demos/programs/FontSel/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/FontSel/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -9,4 +9,4 @@
+ data_DATA = $(EXTRA_DIST) $(fontsel_SOURCES)
+ LDADD = $(TOPDIR)/lib/Xm/libXm.la
+ TOPDIR = ../../..
+-INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/IconB/Makefile.am
motif-2.3.4/demos/programs/IconB/Makefile.am
+--- motif-2.3.4.orig/demos/programs/IconB/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/IconB/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -10,6 +10,6 @@
+ TOPDIR = ../../..
+ LDADD = $(TOPDIR)/lib/Xm/libXm.la
+
+-INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/.. \
++AM_CPPFLAGS = -I$(TOPDIR)/lib -I$(srcdir)/.. \
+ -I$(srcdir)/$(TOPDIR)/lib \
+ ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/Outline/Makefile.am
motif-2.3.4/demos/programs/Outline/Makefile.am
+--- motif-2.3.4.orig/demos/programs/Outline/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/Outline/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -9,4 +9,4 @@
+ data_DATA = $(outline_SOURCES) $(EXTRA_DIST)
+ LDADD = $(TOPDIR)/lib/Xm/libXm.la
+ TOPDIR = ../../..
+-INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/Paned/Makefile.am
motif-2.3.4/demos/programs/Paned/Makefile.am
+--- motif-2.3.4.orig/demos/programs/Paned/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/Paned/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -10,4 +10,4 @@
+ TOPDIR = ../../..
+ LDADD = $(TOPDIR)/lib/Xm/libXm.la
+
+-INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/TabStack/Makefile.am
motif-2.3.4/demos/programs/TabStack/Makefile.am
+--- motif-2.3.4.orig/demos/programs/TabStack/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/TabStack/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -10,4 +10,4 @@
+ TOPDIR = ../../..
+ LDADD = $(TOPDIR)/lib/Xm/libXm.la
+
+-INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/Tree/Makefile.am
motif-2.3.4/demos/programs/Tree/Makefile.am
+--- motif-2.3.4.orig/demos/programs/Tree/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/Tree/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -10,4 +10,4 @@
+ TOPDIR = ../../..
+ LDADD = $(TOPDIR)/lib/Xm/libXm.la
+
+-INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/.. -I$(srcdir)/$(TOPDIR)/lib
${X_CFLAGS}
++AM_CPPFLAGS = -I$(TOPDIR)/lib -I$(srcdir)/.. -I$(srcdir)/$(TOPDIR)/lib
${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/airport/Makefile.am
motif-2.3.4/demos/programs/airport/Makefile.am
+--- motif-2.3.4.orig/demos/programs/airport/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/airport/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -9,4 +9,4 @@
+ EXTRA_DIST = Imakefile XmdAirport.ad README
+ data_DATA = $(airport_SOURCES) $(EXTRA_DIST)
+ LDADD = ../../../lib/Xm/libXm.la
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/animate/Makefile.am
motif-2.3.4/demos/programs/animate/Makefile.am
+--- motif-2.3.4.orig/demos/programs/animate/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/animate/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -19,7 +19,7 @@
+
+ LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Mrm/libMrm.la
../../../lib/Xm/libXm.la
+
+-INCLUDES = -I$(srcdir)/../../../lib \
++AM_CPPFLAGS = -I$(srcdir)/../../../lib \
+ -I$(srcdir)/../../lib \
+ -I$(top_builddir)/lib \
+ ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/drag_and_drop/Makefile.am
motif-2.3.4/demos/programs/drag_and_drop/Makefile.am
+--- motif-2.3.4.orig/demos/programs/drag_and_drop/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/drag_and_drop/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -12,4 +12,4 @@
+ noinst_HEADERS = DNDDemo.h
+ LDADD = ../../../lib/Xm/libXm.la
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/draw/Makefile.am
motif-2.3.4/demos/programs/draw/Makefile.am
+--- motif-2.3.4.orig/demos/programs/draw/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/draw/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -8,4 +8,4 @@
+ EXTRA_DIST = Imakefile XmdDraw.ad README draw.help draw.man
+ data_DATA = $(EXTRA_DIST) $(draw_SOURCES)
+ LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la
+-INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/earth/Makefile.am
motif-2.3.4/demos/programs/earth/Makefile.am
+--- motif-2.3.4.orig/demos/programs/earth/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/earth/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -8,4 +8,4 @@
+ EXTRA_DIST = terre.xbm earth.man Imakefile README
+ data_DATA = $(EXTRA_DIST) $(earth_SOURCES)
+ LDADD = ../../../lib/Xm/libXm.la
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/filemanager/Makefile.am
motif-2.3.4/demos/programs/filemanager/Makefile.am
+--- motif-2.3.4.orig/demos/programs/filemanager/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/filemanager/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -12,6 +12,6 @@
+ s_none.xpm s_pix.xpm
+ data_DATA = $(EXTRA_DIST) $(filemanager_SOURCES)
+ LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la
+-INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
+
+
+diff -Naur motif-2.3.4.orig/demos/programs/fileview/Makefile.am
motif-2.3.4/demos/programs/fileview/Makefile.am
+--- motif-2.3.4.orig/demos/programs/fileview/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/fileview/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -13,7 +13,7 @@
+
+ LDADD = ../../../lib/Xm/libXm.la ../../../lib/Mrm/libMrm.la
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+
+ all: French.uid German.uid English.uid
+
+diff -Naur motif-2.3.4.orig/demos/programs/getsubres/Makefile.am
motif-2.3.4/demos/programs/getsubres/Makefile.am
+--- motif-2.3.4.orig/demos/programs/getsubres/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/getsubres/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -8,4 +8,4 @@
+ getsubres_SOURCES = getsubres.c
+ data_DATA = $(EXTRA_DIST) $(getsubres_SOURCES)
+ LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la
+-INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/hellomotif/Makefile.am
motif-2.3.4/demos/programs/hellomotif/Makefile.am
+--- motif-2.3.4.orig/demos/programs/hellomotif/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/hellomotif/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -8,7 +8,7 @@
+ hellomotif_SOURCES = hellomotif.c
+ data_DATA = $(EXTRA_DIST) $(hellomotif_SOURCES) hellomotif.uid
+ LDADD = ../../../lib/Xm/libXm.la ../../../lib/Mrm/libMrm.la
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+
+ all: hellomotif.uid
+
+diff -Naur motif-2.3.4.orig/demos/programs/hellomotifi18n/Makefile.am
motif-2.3.4/demos/programs/hellomotifi18n/Makefile.am
+--- motif-2.3.4.orig/demos/programs/hellomotifi18n/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/hellomotifi18n/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -11,7 +11,7 @@
+ data_DATA = $(EXTRA_DIST) $(helloint_SOURCES) helloint.uid
+ helloint_DEPENDENCIES = helloint.uid C/uid/l_strings.uid
english/uid/l_strings.uid french/uid/l_strings.uid hebrew/uid/l_strings.uid
japan/uid/l_strings.uid japanese/uid/l_strings.uid swedish/uid/l_strings.uid
+
+-INCLUDES = -I$(top_srcdir)/lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib ${X_CFLAGS}
+ LDADD = $(top_builddir)/lib/Mrm/libMrm.la $(top_builddir)/lib/Xm/libXm.la
+
+ SUFFIXES = .uil .uid
+diff -Naur motif-2.3.4.orig/demos/programs/i18ninput/Makefile.am
motif-2.3.4/demos/programs/i18ninput/Makefile.am
+--- motif-2.3.4.orig/demos/programs/i18ninput/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/i18ninput/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -10,4 +10,4 @@
+ data_DATA = $(EXTRA_DIST) $(i18ninput_SOURCES)
+ LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la
+
+-INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/panner/Makefile.am
motif-2.3.4/demos/programs/panner/Makefile.am
+--- motif-2.3.4.orig/demos/programs/panner/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/panner/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -8,4 +8,4 @@
+ EXTRA_DIST = README panner.man Imakefile
+ data_DATA = $(EXTRA_DIST) $(panner_SOURCES)
+ LDADD = ../../../lib/Xm/libXm.la
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/periodic/Makefile.am
motif-2.3.4/demos/programs/periodic/Makefile.am
+--- motif-2.3.4.orig/demos/programs/periodic/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/periodic/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -9,7 +9,7 @@
+ data_DATA = $(EXTRA_DIST) $(periodic_SOURCES) periodic.uid
+ LDADD = ../../../lib/Xm/libXm.la ../../../lib/Mrm/libMrm.la
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+
+ all: periodic.uid
+
+diff -Naur motif-2.3.4.orig/demos/programs/piano/Makefile.am
motif-2.3.4/demos/programs/piano/Makefile.am
+--- motif-2.3.4.orig/demos/programs/piano/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/piano/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -10,4 +10,4 @@
+ data_DATA = $(EXTRA_DIST) $(piano_SOURCES)
+ LDADD = ../../../lib/Xm/libXm.la -lm
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/popups/Makefile.am
motif-2.3.4/demos/programs/popups/Makefile.am
+--- motif-2.3.4.orig/demos/programs/popups/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/popups/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -9,4 +9,4 @@
+ data_DATA = $(EXTRA_DIST) $(autopopups_SOURCES)
+ LDADD = ../../../lib/Xm/libXm.la
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/sampler2_0/Makefile.am
motif-2.3.4/demos/programs/sampler2_0/Makefile.am
+--- motif-2.3.4.orig/demos/programs/sampler2_0/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/sampler2_0/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -12,4 +12,4 @@
+ data_DATA = $(sampler2_0_SOURCES) $(EXTRA_DIST)
+ LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la
+
+-INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/setdate/Makefile.am
motif-2.3.4/demos/programs/setdate/Makefile.am
+--- motif-2.3.4.orig/demos/programs/setdate/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/setdate/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -9,4 +9,4 @@
+ data_DATA = $(EXTRA_DIST) $(setDate_SOURCES)
+ LDADD = ../../../lib/Xm/libXm.la
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/todo/Makefile.am
motif-2.3.4/demos/programs/todo/Makefile.am
+--- motif-2.3.4.orig/demos/programs/todo/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/todo/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -8,5 +8,5 @@
+ todo_SOURCES = todo.c io.c actions.c page.h
+ data_DATA = $(EXTRA_DIST) $(todo_SOURCES)
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
+ LDADD = -L../../lib/Xmd -lXmd -L../../lib/Exm -lExm
../../../lib/Xm/libXm.la
+diff -Naur motif-2.3.4.orig/demos/programs/tooltips/Makefile.am
motif-2.3.4/demos/programs/tooltips/Makefile.am
+--- motif-2.3.4.orig/demos/programs/tooltips/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/tooltips/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -9,4 +9,4 @@
+ data_DATA = $(tooltips_SOURCES) $(EXTRA_DIST)
+ LDADD = ../../../lib/Xm/libXm.la
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/programs/workspace/Makefile.am
motif-2.3.4/demos/programs/workspace/Makefile.am
+--- motif-2.3.4.orig/demos/programs/workspace/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/programs/workspace/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -10,5 +10,5 @@
+ command_ui.h wsm_cb.h wsm_create.h wsmData.h wsmDebug.h \
+ wsm.h wsmSend.h wsmStruct.h wsm_ui.h xrmLib.h
+ data_DATA = $(wsm_SOURCES) $(EXTRA_DIST)
+-INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
+ LDADD = ../../../lib/Xm/libXm.la -L../../lib/Wsm -lWsm
+diff -Naur motif-2.3.4.orig/demos/unsupported/Exm/Makefile.am
motif-2.3.4/demos/unsupported/Exm/Makefile.am
+--- motif-2.3.4.orig/demos/unsupported/Exm/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/unsupported/Exm/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -7,4 +7,4 @@
+
+ EXTRA_DIST = Imakefile
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/.. -I$(srcdir)/../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(srcdir)/.. -I$(srcdir)/../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/unsupported/aicon/Makefile.am
motif-2.3.4/demos/unsupported/aicon/Makefile.am
+--- motif-2.3.4.orig/demos/unsupported/aicon/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/unsupported/aicon/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -4,6 +4,6 @@
+
+ LDADD = -L../../lib/Xmd -lXmd ../../../lib/Xm/libXm.la
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib
-I$(top_builddir)/lib ${X_CFLAGS}
+
+ EXTRA_DIST = Imakefile
+diff -Naur motif-2.3.4.orig/demos/unsupported/dainput/Makefile.am
motif-2.3.4/demos/unsupported/dainput/Makefile.am
+--- motif-2.3.4.orig/demos/unsupported/dainput/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/unsupported/dainput/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -8,6 +8,6 @@
+
+ EXTRA_DIST = Imakefile
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+
+ noinst_HEADERS = dainput.h
+diff -Naur motif-2.3.4.orig/demos/unsupported/dogs/Makefile.am
motif-2.3.4/demos/unsupported/dogs/Makefile.am
+--- motif-2.3.4.orig/demos/unsupported/dogs/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/unsupported/dogs/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -18,7 +18,7 @@
+
+ LDADD = $(top_builddir)/lib/Mrm/libMrm.la $(top_builddir)/lib/Xm/libXm.la
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+
+ SUFFIXES = .uil .uid
+
+diff -Naur motif-2.3.4.orig/demos/unsupported/hellomotif/Makefile.am
motif-2.3.4/demos/unsupported/hellomotif/Makefile.am
+--- motif-2.3.4.orig/demos/unsupported/hellomotif/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/unsupported/hellomotif/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -8,4 +8,4 @@
+
+ EXTRA_DIST = Imakefile
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/unsupported/motifshell/Makefile.am
motif-2.3.4/demos/unsupported/motifshell/Makefile.am
+--- motif-2.3.4.orig/demos/unsupported/motifshell/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/unsupported/motifshell/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -8,4 +8,4 @@
+
+ EXTRA_DIST = Imakefile
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/unsupported/uilsymdump/Makefile.am
motif-2.3.4/demos/unsupported/uilsymdump/Makefile.am
+--- motif-2.3.4.orig/demos/unsupported/uilsymdump/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/unsupported/uilsymdump/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ noinst_PROGRAMS = uilsymdump
+
+-INCLUDES = -I$(srcdir)/../../../clients -I$(srcdir)/../../../lib
-I../../../clients -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../clients -I$(srcdir)/../../../lib
-I../../../clients -I$(top_builddir)/lib ${X_CFLAGS}
+
+ EXTRA_DIST = Imakefile
+
+diff -Naur motif-2.3.4.orig/demos/unsupported/xmapdef/Makefile.am
motif-2.3.4/demos/unsupported/xmapdef/Makefile.am
+--- motif-2.3.4.orig/demos/unsupported/xmapdef/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/unsupported/xmapdef/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -8,4 +8,4 @@
+
+ EXTRA_DIST = Imakefile
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/unsupported/xmfonts/Makefile.am
motif-2.3.4/demos/unsupported/xmfonts/Makefile.am
+--- motif-2.3.4.orig/demos/unsupported/xmfonts/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/unsupported/xmfonts/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -8,4 +8,4 @@
+
+ EXTRA_DIST = Imakefile
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/unsupported/xmforc/Makefile.am
motif-2.3.4/demos/unsupported/xmforc/Makefile.am
+--- motif-2.3.4.orig/demos/unsupported/xmforc/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/unsupported/xmforc/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -8,4 +8,4 @@
+
+ EXTRA_DIST = Imakefile
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/demos/unsupported/xmform/Makefile.am
motif-2.3.4/demos/unsupported/xmform/Makefile.am
+--- motif-2.3.4.orig/demos/unsupported/xmform/Makefile.am 2012-10-22
16:50:38.000000000 +0200
++++ motif-2.3.4/demos/unsupported/xmform/Makefile.am 2013-06-23
17:28:06.000000000 +0200
+@@ -8,4 +8,4 @@
+
+ LDADD = ../../../lib/Xm/libXm.la
+
+-INCLUDES = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/lib/Mrm/Makefile.am
motif-2.3.4/lib/Mrm/Makefile.am
+--- motif-2.3.4.orig/lib/Mrm/Makefile.am 2012-10-22 16:50:34.000000000
+0200
++++ motif-2.3.4/lib/Mrm/Makefile.am 2013-06-23 17:28:06.000000000 +0200
+@@ -2,7 +2,7 @@
+ CLEANFILES = $(BUILT_SOURCES)
+ EXTRA_DIST = Mrm.msg Imakefile
+
+-INCLUDES = -I$(srcdir)/.. -I.. -I../Xm ${X_CFLAGS}
++AM_CPPFLAGS = -I$(srcdir)/.. -I.. -I../Xm ${X_CFLAGS}
+
+ mrmdir = $(includedir)/Mrm
+
+diff -Naur motif-2.3.4.orig/lib/Xm/Makefile.am motif-2.3.4/lib/Xm/Makefile.am
+--- motif-2.3.4.orig/lib/Xm/Makefile.am 2012-10-22 16:50:34.000000000
+0200
++++ motif-2.3.4/lib/Xm/Makefile.am 2013-06-23 17:28:06.000000000 +0200
+@@ -5,7 +5,7 @@
+ EXTRA_DIST = xmstring.list Xm.msg Imakefile \
+ XmStrDefs.ct
+
+-INCLUDES = -I.. -I$(srcdir)/..
-DXMBINDDIR_FALLBACK=\"@XMBINDDIR_FALLBACK@\" \
++AM_CPPFLAGS = -I.. -I$(srcdir)/..
-DXMBINDDIR_FALLBACK=\"@XMBINDDIR_FALLBACK@\" \
+ -DINCDIR=\"@INCDIR@\" \
+ -DLIBDIR=\"@LIBDIR@\" \
+ ${X_CFLAGS}
+diff -Naur motif-2.3.4.orig/tools/wml/Makefile.am
motif-2.3.4/tools/wml/Makefile.am
+--- motif-2.3.4.orig/tools/wml/Makefile.am 2012-10-22 16:50:39.000000000
+0200
++++ motif-2.3.4/tools/wml/Makefile.am 2013-06-23 17:28:06.000000000 +0200
+@@ -32,7 +32,7 @@
+
+ wmldbcreate_LDADD = ../../lib/Xm/libXm.la
+
+-INCLUDES = -I../../lib -I$(srcdir)/../../lib -I$(srcdir)/../../include
${X_CFLAGS}
++AM_CPPFLAGS = -I../../lib -I$(srcdir)/../../lib -I$(srcdir)/../../include
${X_CFLAGS}
+
+ noinst_LIBRARIES = libwml.a
+ libwml_a_SOURCES = wmlparse.y wml.c wmloutkey.c wmlouth.c wmloutmm.c
wmloutp1.c wmlresolve.c wmlsynbld.c wmlutils.c



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (589dbf5761a152f5653f7593d260d8aa2b27e87e), Treeve Jelbert, 06/27/2013

Archive powered by MHonArc 2.6.24.

Top of Page