sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (63f3653a1f50520be135ebef70b91affe2524ada)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (63f3653a1f50520be135ebef70b91affe2524ada)
- Date: Sun, 29 Jul 2012 17:05:05 -0500
GIT changes to stable-0.61 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
ChangeLog | 12
VERSION | 2
audio-creation/supercollider/DEPENDS | 2
audio-creation/supercollider/HISTORY | 3
audio-libs/libdts/BUILD | 1
audio-libs/libdts/CONFLICTS | 1
audio-libs/libdts/DETAILS | 24
audio-libs/libdts/DOWNLOAD | 1
audio-libs/libdts/HISTORY | 5
audio-libs/libdts/INSTALL | 1
audio-libs/libdts/PRE_BUILD | 1
audio-libs/libdts/UP_TRIGGERS | 2
audio-libs/libgpod/DEPENDS | 20
audio-libs/libgpod/HISTORY | 4
audio-players/audacious/DEPENDS | 4
audio-players/audacious/HISTORY | 3
audio-plugins/audacious-plugins/DEPENDS | 4
audio-plugins/audacious-plugins/HISTORY | 5
chat-im/carrier/DEPENDS | 5
chat-im/carrier/HISTORY | 3
chat-im/pidgin/DEPENDS | 5
chat-im/pidgin/DETAILS | 4
chat-im/pidgin/HISTORY | 6
crypto/openssh/HISTORY | 3
crypto/openssh/PRE_BUILD | 2
crypto/openssh/openssh-lpk-5.9p1.patch.bz2 | 0
crypto/openssh/openssh-lpk-6.0p1-0.3.14.patch.bz2 |binary
database/mysql-workbench/DEPENDS | 4
database/mysql-workbench/HISTORY | 3
dev/null |binary
devel/automake/DETAILS | 3
devel/automake/HISTORY | 6
devel/iasl/DETAILS | 6
devel/iasl/HISTORY | 3
disk/fuse/HISTORY | 3
disk/fuse/PRE_BUILD | 16
e-17/evas/DEPENDS | 8
e-17/evas/HISTORY | 3
editors/gobby/DEPENDS | 2
editors/gobby/HISTORY | 3
gnome2-apps/dia/DEPENDS | 1
gnome2-apps/dia/HISTORY | 4
gnome2-apps/dia/PRE_BUILD | 7
gnome2-apps/gnome-user-share/DEPENDS | 2
gnome2-apps/gnome-user-share/HISTORY | 3
gnome2-libs/gnome-vfs2/DEPENDS | 5
gnome2-libs/gnome-vfs2/HISTORY | 3
gnome2-libs/libgnomeprint/HISTORY | 5
gnome2-libs/libgnomeprint/PRE_BUILD | 4
gnome2-libs/libgnomeprint/stdio.patch | 9
gnome2-libs/nautilus-dropbox/DEPENDS | 3
gnome2-libs/nautilus-dropbox/HISTORY | 3
graphics-libs/fop/DETAILS | 2
graphics-libs/fop/HISTORY | 3
graphics-libs/libpng/DETAILS | 8
graphics-libs/libpng/HISTORY | 3
http/firefox/DETAILS | 6
http/firefox/HISTORY | 5
http/firefox/PRE_BUILD | 5
http/firefox/installer.patch | 112 +
http/seamonkey/DETAILS | 6
http/seamonkey/HISTORY | 6
kernels/linux/HISTORY | 20
kernels/linux/info/kernels/3.5 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.37 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.38 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.20 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.21 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.22 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.23 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.5 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.6 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.5 | 5
kernels/linux/latest.defaults | 4
mobile/pilot-link/HISTORY | 4
mobile/pilot-link/PRE_BUILD | 4
mobile/pilot-link/perl.patch | 625
++++++++++
net/bind-tools/DETAILS | 4
net/bind-tools/HISTORY | 3
net/howl/BUILD | 1
net/howl/DETAILS | 22
net/howl/DOWNLOAD | 1
net/howl/HISTORY | 5
net/howl/INSTALL | 1
net/howl/PRE_BUILD | 5
net/howl/UP_TRIGGERS | 2
net/howl/kernel-headers.patch | 13
net/nsd/DETAILS | 6
net/nsd/HISTORY | 6
net/samba/DEPENDS | 31
net/samba/DETAILS | 3
net/samba/HISTORY | 8
net/samba/init.d/samba | 21
net/xinetd/DEPENDS | 2
net/xinetd/HISTORY | 3
security-libs/linux-pam/CONFIGURE | 1
security-libs/linux-pam/DEPENDS | 5
security-libs/linux-pam/HISTORY | 6
security-libs/linux-pam/INSTALL | 2
security/wireshark/DETAILS | 6
security/wireshark/HISTORY | 6
shell-term-fm/rdesktop/BUILD | 1
shell-term-fm/rdesktop/DEPENDS | 11
shell-term-fm/rdesktop/HISTORY | 3
utils/quvi/DEPENDS | 2
utils/quvi/HISTORY | 3
video-libs/libfame/BUILD | 5
video-libs/libfame/HISTORY | 6
video-libs/libfame/PRE_BUILD | 10
video-libs/libfame/libfame-0.9.1-fstrict-aliasing.patch | 32
video-libs/libfame/libfame-0.9.1-underquoted.patch | 12
video-libs/libfame/libfame-0.9.1-x86_64.patch | 15
video-libs/xine-lib/DEPENDS | 2
video-libs/xine-lib/DETAILS | 6
video-libs/xine-lib/HISTORY | 6
video/ffmpeg/DEPENDS | 19
video/ffmpeg/DETAILS | 6
video/ffmpeg/HISTORY | 12
video/mplayer2/BUILD | 6
video/mplayer2/DEPENDS | 4
video/mplayer2/HISTORY | 4
video/transcode/DEPENDS | 30
video/transcode/HISTORY | 3
video/vlc/HISTORY | 5
video/vlc/PRE_BUILD | 4
video/vlc/lua-scripts.patch | 131 ++
video/vlc/lua.patch | 411 ++++++
video/xbmc/DEPENDS | 2
video/xbmc/HISTORY | 3
wm-addons/xxkb/DEPENDS | 1
wm-addons/xxkb/HISTORY | 3
x11-libs/cairo/DEPENDS | 12
x11-libs/cairo/HISTORY | 8
x11-libs/cairo/PRE_SUB_DEPENDS | 1
x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS | 1
x11-libs/cairo/SUB_DEPENDS | 4
x11-toolkits/gtk+3/DEPENDS | 4
x11-toolkits/gtk+3/HISTORY | 3
x11-toolkits/gtk-sharp-2/DETAILS | 8
x11-toolkits/gtk-sharp-2/HISTORY | 7
x11-toolkits/gtk-sharp-2/PRE_BUILD | 1
x11-toolkits/gtk-sharp-2/glib_fix.patch | 117 +
x11-toolkits/gtk-sharp-2/gtk-sharp-2.12.10.tar.bz2.sig | 0
x11/easystroke/HISTORY | 3
x11/easystroke/TRIGGERS | 1
x11/gtk-chtheme/HISTORY | 4
x11/gtk-chtheme/PRE_BUILD | 4
x11/gtk-chtheme/gtk224.patch | 22
x11/x11vnc/DEPENDS | 1
x11/x11vnc/HISTORY | 4
xfce/xfburn/HISTORY | 7
xfce/xfburn/PRE_BUILD | 6
xfce/xfburn/glib232.patch | 10
153 files changed, 2051 insertions(+), 193 deletions(-)
New commits:
commit 63f3653a1f50520be135ebef70b91affe2524ada
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
VERSION: 0.61-2
commit 56ca4b78c4fb888a85b8ea00de7c69529c678a94
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
samba: fixed longer starting/stopping (don't resolve numeric IPs and
ports)
(cherry picked from commit 2d46f67cd5e3060d494abca314fe5f62963540a3)
Conflicts:
net/samba/DETAILS
commit f2093653a6b8700b92cb4022268f746cf5e675aa
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
quvi: depends on lua51
It doesn't build with lua 5.2+.
(cherry picked from commit 72775e9f8f2a75b27baf20dfad54bcdc26247bb3)
commit b2b0500c21b9e1b32787e804e367b9d8297c3363
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nsd: => 3.2.13 (security)
(cherry picked from commit 9ce03337fdbec07c718237f797fb54338f1b0413)
commit d29a6e0491b3fd685e9b83dba6fe14fdd38cb801
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xfce/xfburn: apply glib232.patch to stable branch only
(cherry picked from commit 17e7728529f61d1984c50fe3c5ae88fbdcb34b0a)
commit 717f2d063396f71a981c985d5fd0a2c001644914
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
dia: use system docbook-xsl instead of online to generate man pages
(cherry picked from commit 13ad19d28eee8436df300ccf657390dcd13584cb)
commit ba0a93e7f1ee07839e1478c6c23568035dc325bd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
fop: fixed source url
(cherry picked from commit 79b0883ffd965f1d1e77341a647ec7c1ad8d12e2)
commit 58654307d1d41dee93eccd9a891baaa52c888f6d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
audacious-plugins: fixed broken MP3 dependency
(cherry picked from commit 71bb66694d6ccfa351c718d391b63caa8c638f97)
commit da790d3e3c0b3c810b895f2ae9d9ba4aea00d46d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
audacious: added missing gtk+3 dependency
(cherry picked from commit 6a1a4ab075327df4c10c51275ff588fcc81f9614)
Conflicts:
audio-players/audacious/HISTORY
commit 2005a0ea82fc9930358579be907e0fea7e556900
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
audacious-plugins: fixed broken AAC dependency
(cherry picked from commit 45f1d9fa667e4306a009885a9dfed0c8313b7aa5)
Conflicts:
audio-plugins/audacious-plugins/HISTORY
commit cd5371cc5e80994f555ef709eac123795ac42ec4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux: => 3.0.38 (lts)
(cherry picked from commit f4a672e33ce43f200d647c7ec5e2ea9f53ba1bbe)
commit 07535f9910a61306a34c2286086eef339ebb9f32
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
x11vnc: added required libxtst dependency
log from configure:
==========================================================================
*** A working build environment for the XTEST extension was not found ***
(libXtst). An x11vnc built this way will be *ONLY BARELY USABLE*.
You will be able to move the mouse but not click or type. There can
also be deadlocks if an application grabs the X server.
It is recommended that you install the necessary development packages
for XTEST (perhaps it is named something like libxtst-dev) and run
configure again.
==========================================================================
(cherry picked from commit 596b0d46e99c84dbe790d56dc3a4784ba06fdbdd)
commit 008bf3ac6b51c6b35dfcdd6e0d7594abe6e67448
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xfburn: fixed build with recent glib2
(cherry picked from commit 95a3b86f6b51556d5bb962d7680245d5a9ada03b)
commit d9f8421a5d77c3d597abbdf0fbdf8f2a91d7b469
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
bind-tools: => 9.9.1-P2 (security)
(cherry picked from commit b30f06d64f7ae0b6b4d8740e3070f350272c6464)
commit 51f6ace7cebd3d35b370e2562f02d1ab0b8701df
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
rdesktop: dropped broken libvncserver dependency
(cherry picked from commit 367bcd1a92ce8a9194540f70868971b7e548c015)
commit 206396ff1da9b6cf3aa71159d645af7e87d27357
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gtk-chtheme: fixed build with gtk+2 >= 2.24
(cherry picked from commit 68f542d2f1a98f00125acefcb12f6e08e209254d)
commit 7aac879d15a44fcb6b32b03c71853ed857b5c536
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gtk+3: fixed compilation when cairo had been installed earlier than glib2
(cherry picked from commit 3d38e24b570307f8346d3fb8d099ea37a349257c)
Conflicts:
x11-toolkits/gtk+3/HISTORY
commit d1977fc3b58e5230b3c2f819f869f17ea0b34620
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
cairo: added glib2 subdependency
(cherry picked from commit b33a7e8a324c3056c7c8a5cf999554a10ac5e5da)
commit 75caffa82ad6038ada0bc18aa914ad53fe34b96e
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
cairo: added depends xz-utils, it's not part of basesystem...
(cherry picked from commit 568a500b6e377a894abfc54876bceeb446744c28)
commit 24b324cb42adf97488721004764568bc2385aefd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xxkb: added missing imake dependency
(cherry picked from commit e2df88bb892561073cedb1b4068da5e6657d3a44)
commit d51419b3fbf2acde4b83669d21cea4a89fb69c67
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
wireshark 1.8.1, SECURITY_PATCH=37
(cherry picked from commit b89cf872e65a4679b23974912c9dec92487a4832)
commit 5b4c091aed0aaf1faa536d2cb421cd930ed13373
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
wireshark 1.8.0
(cherry picked from commit d9fce2f0a0b8ed4ebd0d2088991fec564a8ca3ef)
commit 995af7976c20ee983a2e8a34bcd9fe8a2e4fdc08
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
easystroke: added TRIGGERS to check_self when boost is cast
(cherry picked from commit af6c676be550f2ced7c3ac21cacbbafacce46d92)
commit 4fb47fd36a10b1d787f9c8a35ef147f9388f001b
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
disk/fuse: unlock.patch now applies to stable branch only
(cherry picked from commit 2f78636d21727218c74284b662fad5ff481b9aa7)
commit 3d3ab2f082c85d13c457f3bf89f80aefbd2a0308
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux 3.5
(cherry picked from commit d223235ea9f0f135ff07da3d086abe8938468aec)
commit 94e5b8c8150efdfe91348b4e1826c6bffd10f248
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
transcode: make it build again
(cherry picked from commit 06321465949d9bd57d54ab70711454b104646a52)
commit a3736b5ef8fe3d553a183ff9ebee221fb640bc3e
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
video/mplayer2: fixed scm branch dependencies
(cherry picked from commit 136880d68695a7994264186561b26f2f6723b302)
commit bc8dab914edd78e1f038b97e3b3f7e9949f1c1f1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nsd: => 3.2.12 (security)
(cherry picked from commit ef8d06901ddc3c4c9f313b651b2647caf92915f7)
commit a11c0a223b847699293e04979db5044082b24b91
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libpng 1.2.50, SECURITY_PATCH=9, CVE-2012-3386
(cherry picked from commit 05c806e9cd3694f1eb873b3b0563fe950f25ebe6)
commit 51f9e03cef68f913bc76be7801edc0ae63e03373
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux 3.4.6
(cherry picked from commit ee0e6fd6797844bba52b16d924ccdeccd8f2d9cf)
commit 4efdbe06581277c60c9f000c50e89ad191a28984
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
http/firefox: version 14.0.1
(cherry picked from commit 33052f7d8d82024613392fd40c3a0fe364195d72)
commit 49d9970abe42f387191752eb61b81e86adb2609a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
seamonkey 2.11, SECURITY_PATCH=44
(cherry picked from commit 42d5e0b2cb508adc798b913037782d8cfb5ccdb4)
commit 1d61fd0e19e13e662572a96c4a2078081c097349
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
seamonkey: => 2.10.1
(cherry picked from commit 516a846eec9f0999cfac28d798717b740f8ca1df)
commit 23d85c2aa9cad843a900978109a930eaac9ed334
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux => 3.0.37 (lts), 3.2.23 (lts)
(cherry picked from commit e68dd30f263629afd5e55c3722670beed5849bdd)
commit f4698ef0b1245a6277752a5c48c1489d9e9e4692
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
iasl: => 20120711
(cherry picked from commit 0dfbc06e3d6558df03c2c294f92f2fae12286111)
commit 77502235cb906d93c4c0c4bc9e172e34c0d80955
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux 3.4.5
(cherry picked from commit d39986fff2b22957c06ff96332f53048c885e655)
commit 3aba4bf0e5214ed0d41d5889d38168dd99e4e1c7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
samba: added more optional deps
(cherry picked from commit cc2ba40ecaf81ff087d5c20af4827f7b20194537)
commit cb25ae61cdc5c1d3339583fe96981eb28d69f1ed
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
samba: libcap becomes optional
(cherry picked from commit e67adddbb730022c0149de9bc4e15e228f4563a2)
Conflicts:
net/samba/HISTORY
commit decb40e9ca94dedc1820a6be77f3b09910def598
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
howl: spell deprecated [Replaced by avahi and no longer compiles for me.]
PATCHLEVEL=9999
Not sure if its possible to add a sub_depends to UP_TRIGGERS. I couldn't
find any documentation of it anyway.
(cherry picked from commit 0e09df962b462d08978ed6a98193baa5c8b9b4f6)
commit 96786799cf45c94f826c62e3d33e3357558cd8f0
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libdts: deprecated, forgot to commit ChangeLog
(cherry picked from commit 3846b3b2dc4a56af6bc197db5ef5f4dd8c479b70)
Conflicts:
ChangeLog
commit 2d23da6c0865911e28c868b0507b9d8bfc039718
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
supercollider: depends howl -> -sub COMPAT_HOWL avahi
(cherry picked from commit 43371aca2c86d31986a793ef5a9a813c09d5cd8c)
commit 05c1d65f6a676e0080034932430f2a2dd56755fe
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gobby: depends howl -> -sub COMPAT_HOWL avahi
(cherry picked from commit 970cfed3f53f2e9b6f95b682aacac70dd4e23fd0)
commit 2de0bd4ae22c2af4682102e932935d77c72b77f4
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gnome-vfs2: removed optional_depends howl
(cherry picked from commit 4325296af61f02246681ed01e21d7387e0bc6f70)
commit 174d6cbf94ce599ffc21f5f080fb54054646bbcc
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xinetd: optional_depends howl -> -sub COMPAT_HOWL avahi
(cherry picked from commit ad12f5e6a73535f4b193b3c7de3563909279a0c5)
commit 94c1c91e646b5d6bfcdd9bfe58d3dde0b7acd3f2
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gnome-user-share: howl -> -sub COMPAT_HOWL avahi
(cherry picked from commit fcb11fa4fc97c2fc358b2adb75191a4caf1da5df)
commit 8ef5fbace8d872f768e6bf3d108266da110b4b77
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
carrier: removed optional-depends howl
(cherry picked from commit 5d987c81b9d973da30e7f8ab20fd41d07b041540)
commit ab031ad5118bd819adb8c966b570f0d990bf63b3
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pidgin: removed optional-depends howl
(cherry picked from commit ce964d008500a740777cb3e1715df9ac3b6967e0)
Conflicts:
chat-im/pidgin/HISTORY
commit 174fd27e90182f99706b93c47f9d01b9c8131a9c
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mysql-workbench: howl -> -sub COMPAT_HOWL avahi
(cherry picked from commit ebdb69b7d702ea669a46f2c151bc561922f86b7b)
commit a0445e5d41810a4b133129e461bd071a4c50d0a7
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libdts: spell deprecated [libdca replaced libdts a long time ago.]
PATCHLEVEL=9999
(cherry picked from commit e4dabd61260b6a760835fe05586b141f597b84e6)
commit ea1fd271b15397099e6ac2c004e8704da682e06f
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xbmc: changed optional_depends libdts to libdca
(cherry picked from commit e0eeb94f3c8f313a63af6569a7c702b40ec7cbe8)
commit 5454f7bc0edb7231917d48875f0de28745a85dd5
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xine-libs: replaced optional_depends libdts with libdca
(cherry picked from commit 26a1ac8a57762c6b20dfeb9e544d5f677a129113)
commit df9bd700aedf8212c30ca8fd4f2ce334af00f3c7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xine-lib: => 1.2.2
(cherry picked from commit eaa0dc934aedd59ee5dad40aaf2b61019f8adc12)
commit 1e3ec3244a2e47b47fff668e5c745f0a35f6da35
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libfame: fix build
* PRE_BUILD: added to apply patches and run autoreconf
* BUILD: added to pass sse and mmx flags
* libfame-0.9.1-fstrict-aliasing.patch, libfame-0.9.1-underquoted.patch,
libfame-0.9.1-x86_64.patch: added, from RPMforge. Fixes build.
(cherry picked from commit 78055afc039b9142d5966fa594dde24205457fd4)
commit 7cd9305d26d0bd271e3170be03138f6353217600
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pilot-link: actually add files
(cherry picked from commit 0a433121fc5386811dd7b25aa2d41e3ac9315d60)
commit 4ff77394f762c03f66be4f0ab9b25b558e259d52
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pilot-link: fix compilation with perl>=5.14
(cherry picked from commit d896741dae69b0688934052ea360e86b1f66c003)
commit 9485c613cd7cabb342e6cb471e9f5b1b0619e98b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
evas configure options sdl updated
configure: WARNING: unrecognized options: --enable-software-sdl
(cherry picked from commit b0d08d022e8ec65a9f98e9580e1514d0b1fc504b)
commit de1bbdee149b35707a178a6e3e4c89cfc25e4a5f
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
openssh: updated LPK patch to 6.0p1 (fixes #404)
(cherry picked from commit a2403d047dbefc9264417b313875767399c20a26)
commit df8a46cb72bf4b19573d05d4857de367af67fcab
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nautilus-dropbox: Depends on docutils
checking for docutils... no
configure: error: couldn't find docutils
(cherry picked from commit 0a61ba940e834a0d60356500e0a8b9a2ea88a5ab)
commit 81d5d533ad80b0404e720987491d43cb50f4fb7a
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libgpod: added optional_depends gtk-sharp-2 & udev
changed GTK2 to gdk-pixbuf2
(cherry picked from commit 9023f4a6ce2d14979fdaf9ff38b81e7a291cdfc9)
commit c09d7802e2149a109ab2b8e52b68bec9552e8bc5
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gtk-sharp-2: issue #407 - fix build with glib2 >= 2.31
(cherry picked from commit c62bc1b8f616f66c2506bcd9ccf0285724b15495)
commit a2628acdd9843d7a91917a281cea17c82d4c08d3
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
automake 1.12.2, SECURITY_PATCH=1, CVE-2012-3386
(cherry picked from commit c293ba6f4b9f408b4519e86635169b92c17f3a75)
commit 0544291162d7099b53ec4afa5dbe35fedc6a980c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
automake 1.12.1
(cherry picked from commit 12e8a758f9f863b6502d64dfcc71c69e364b55fa)
commit e2aec0bc7c807fa7da01e88a76a1a60064a96782
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libgnomeprint: fix compilation by adding missing header
* PRE_BUILD: added, to apply patch
* stdio.patch: added, patch to apply missing header.
(cherry picked from commit a7ba654b7a40cef8017daf407e3e1727e694f874)
commit aa984cdc70ee66f39a565529364033d59485ef15
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux-pam: switch to optional_depends for selinux to pass proper flags
* CONFIGURE: remove config_query for SELINUX
* INSTALL: fix commented out check for libselinux in case someone needs it
(cherry picked from commit 7863c993cae5487870ab7307551069f2340fb975)
commit 88b352796adc4a580a308b0057f041a85ec80104
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
vlc: apply lua 5.2 fixes
lua.patch, lua-scripts.patch: added, applies fixes for lua 5.2. From
upstream. I assume this will be in the next major update
(cherry picked from commit 12b7177c30022be43384bd9c650c6c173292f0d5)
commit e3d8f7bdcb0968fe84a57c981e19bf1c4d266131
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pidgin 2.10.5, SECURITY_PATCH=15
(cherry picked from commit 0850d2cb782137b97fa704f37b013b4bff107dff)
commit 8738abf8849cb962eee366605c110596e1615a66
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ffmpeg: => 0.11.1 (stable)
(cherry picked from commit 85726cab7077fbcc97173708df44d0d2f3289cf6)
commit 17a6a94f02a84ccca19f76d75a9426ec7702ee0b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ffmpeg: => 0.7.13 (legacy)
(cherry picked from commit 782d679ffec0cec66582ecbcc060236e628a08a5)
commit 2ab78ae6952929c7440195ad6c9dd84fac89728d
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ffmpeg: stable => 0.11
DEPENDS: dirac replaced by schroedinger in stable
yasm -> X86-assembler (--disable-yasm is still valid)
optional_depends libvpx added for stable
(cherry picked from commit 3360249b418f926ee4cda58058db80832c60ce19)
diff --git a/ChangeLog b/ChangeLog
index 739af3e..2d47e95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
+2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * net/howl: spell deprecated
+ [Replaced by avahi and no longer compiles for me.]
+
+2012-07-14 Sukneet Basuta <sukneet AT sourcemage.org>
+ * audio-libs/libdts: spell deprecated
+ [libdca replaced libdts a long time ago.]
+
2012-05-25 Sukneet Basuta <sukneet AT sourcemage.org>
- * gnu.gpg: added 5B147849: public key for "Aspell Dictionary
+ * gnu.gpg: added 5B147849: public key for "Aspell Dictionary
Upload <dict-upload AT aspell.net>"
- * kernel.gpg: added (on 2012-05-15) 6092693E Greg Kroah-Hartman
+ * kernel.gpg: added (on 2012-05-15) 6092693E Greg Kroah-Hartman
(Linux kernel stable release signing key)
2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
diff --git a/VERSION b/VERSION
index efbad72..f988e77 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.61-1
+0.61-2
diff --git a/audio-creation/supercollider/DEPENDS
b/audio-creation/supercollider/DEPENDS
index 543ef15..d84e7ff 100755
--- a/audio-creation/supercollider/DEPENDS
+++ b/audio-creation/supercollider/DEPENDS
@@ -1,4 +1,4 @@
depends scons &&
depends libsndfile &&
-depends howl &&
+depends -sub COMPAT_HOWL avahi &&
depends JACK-DRIVER
diff --git a/audio-creation/supercollider/HISTORY
b/audio-creation/supercollider/HISTORY
index fdbe902..a0cf109 100644
--- a/audio-creation/supercollider/HISTORY
+++ b/audio-creation/supercollider/HISTORY
@@ -1,3 +1,6 @@
+2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: howl -> -sub COMPAT_HOWL avahi
+
2010-10-19 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed so it downloads svn source
* DOWNLOAD: removed, we don't need DOWNLOAD file for svn
diff --git a/audio-libs/libdts/BUILD b/audio-libs/libdts/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libdts/BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libdts/CONFLICTS b/audio-libs/libdts/CONFLICTS
deleted file mode 100755
index abc439c..0000000
--- a/audio-libs/libdts/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts libdca y
diff --git a/audio-libs/libdts/DETAILS b/audio-libs/libdts/DETAILS
index 1a66bbf..ed23bc5 100755
--- a/audio-libs/libdts/DETAILS
+++ b/audio-libs/libdts/DETAILS
@@ -1,17 +1,7 @@
- SPELL=libdts
- VERSION=0.0.2
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://download.videolan.org/pub/videolan/$SPELL/$VERSION/$SOURCE
- WEB_SITE=http://www.videolan.org/dtsdec.html
-
SOURCE_HASH=sha512:b979aa2f5da5f6a0d56bac672c700b18393628b999a67b7a062a5f45233d357344308c6d194c6a723285dfb2072d6dc256e6b2fd9a68b9b865d6ca15d0583f60
- LICENSE[0]=GPL
- ENTERED=20040302
- KEYWORDS="streaming audio libs"
- SHORT="libdts is a free library for decoding DTS Coherent
Acoustics streams."
-cat << EOF
-libdts is a free library for decoding DTS Coherent Acoustics streams. It is
-released under the terms of the GPL license. The DTS Coherent Acoustics
-standard is used in a variety of applications, including DVD, DTS audio CD
and
-radio broadcasting.
-EOF
+ SPELL=libdts
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by libdca]
+ EOF
diff --git a/audio-libs/libdts/DOWNLOAD b/audio-libs/libdts/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libdts/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libdts/HISTORY b/audio-libs/libdts/HISTORY
index c61f000..e70f9d1 100644
--- a/audio-libs/libdts/HISTORY
+++ b/audio-libs/libdts/HISTORY
@@ -1,3 +1,8 @@
+2012-07-14 Sukneet Basuta <sukneet AT sourcemage.org>
+ * spell deprecated [libdca replaced libdts a long time ago.]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2007-09-29 Pol Vinogradov <vin.public AT gmail.com>
* CONFLICTS: added for libdca
diff --git a/audio-libs/libdts/INSTALL b/audio-libs/libdts/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libdts/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libdts/PRE_BUILD b/audio-libs/libdts/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libdts/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libdts/UP_TRIGGERS b/audio-libs/libdts/UP_TRIGGERS
new file mode 100755
index 0000000..ff0d2bc
--- /dev/null
+++ b/audio-libs/libdts/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger libdts dispel_self
+up_trigger libdca cast_self
diff --git a/audio-libs/libgpod/DEPENDS b/audio-libs/libgpod/DEPENDS
index 6876988..86b6d64 100755
--- a/audio-libs/libgpod/DEPENDS
+++ b/audio-libs/libgpod/DEPENDS
@@ -4,23 +4,31 @@ depends xml-parser-expat &&
optional_depends libxml2 \
'--enable-libxml' \
'--disable-libxml' \
- 'To parse SysInfoExtended' &&
-optional_depends GTK2 \
+ 'to parse SysInfoExtended' &&
+optional_depends gdk-pixbuf2 \
'--enable-gdk-pixbuf' \
'--disable-gdk-pixbuf' \
- 'Enable ArtworkDB' &&
+ 'to enable ArtworkDB' &&
+optional_depends gtk-sharp-2 \
+ '--with-mono' \
+ '--without-mono' \
+ 'to build mono binding' &&
optional_depends pygobject \
'--enable-pygobject' \
'--without-python --disable-pygobject' \
- 'Enable python bindings?' &&
+ 'to enable python bindings' &&
if is_depends_enabled $SPELL pyobject; then
depends mutagen
fi &&
optional_depends gtk-doc \
'--enable-gtk-doc' \
'--disable-gtk-doc' \
- 'Build documentation?' &&
+ 'to build documentation' &&
+optional_depends udev \
+ '--enable-udev' \
+ '--disable-udev' \
+ 'to enable udev support' &&
optional_depends hal \
'--with-hal' \
'--without-hal' \
- 'Enable hal support'
+ 'to enable hal support'
diff --git a/audio-libs/libgpod/HISTORY b/audio-libs/libgpod/HISTORY
index d7b43fa..acbc238 100644
--- a/audio-libs/libgpod/HISTORY
+++ b/audio-libs/libgpod/HISTORY
@@ -1,3 +1,7 @@
+2012-07-11 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: added optional_depends gtk-sharp-2 & udev
+ changed GTK2 to gdk-pixbuf2
+
2011-08-18 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.8.2
Changed SOURCE[0] extension
diff --git a/audio-players/audacious/DEPENDS b/audio-players/audacious/DEPENDS
index 7b3e6b1..4799d9d 100755
--- a/audio-players/audacious/DEPENDS
+++ b/audio-players/audacious/DEPENDS
@@ -5,6 +5,10 @@ depends libmowgli &&
depends pango &&
depends cairo &&
+optional_depends gtk+3 \
+ "" "--disable-gtk3" \
+ "to use GTK3 instead of GTK2" &&
+
optional_depends libsamplerate \
"--enable-samplerate" \
"--disable-samplerate" \
diff --git a/audio-players/audacious/HISTORY b/audio-players/audacious/HISTORY
index 1097c77..c6f2c35 100644
--- a/audio-players/audacious/HISTORY
+++ b/audio-players/audacious/HISTORY
@@ -1,3 +1,6 @@
+2012-07-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing gtk+3 dependency
+
2011-09-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.0.3
diff --git a/audio-plugins/audacious-plugins/DEPENDS
b/audio-plugins/audacious-plugins/DEPENDS
index d0fd37c..b9b07ba 100755
--- a/audio-plugins/audacious-plugins/DEPENDS
+++ b/audio-plugins/audacious-plugins/DEPENDS
@@ -43,7 +43,7 @@ optional_depends flac \
"" \
"--disable-flacng --disable-filewriter_flac" \
"for flac support" &&
-optional_depends libmad \
+optional_depends mpg123 \
"" \
"--disable-mp3" \
"for reading MP3 files" &&
@@ -55,7 +55,7 @@ optional_depends wavpack \
"" \
"--disable-wavpack" \
"for wavpack support" &&
-optional_depends faac \
+optional_depends faad2 \
"" \
"--disable-aac" \
"for aac support" &&
diff --git a/audio-plugins/audacious-plugins/HISTORY
b/audio-plugins/audacious-plugins/HISTORY
index 6d425e8..1434095 100644
--- a/audio-plugins/audacious-plugins/HISTORY
+++ b/audio-plugins/audacious-plugins/HISTORY
@@ -1,3 +1,8 @@
+2012-07-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: faac isn't AAC decoder, but AAC encoder;
+ mpg123 is required for MP3 support, not libmad;
+ always check configure.ac file better twice.
+
2011-10-12 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: removed optional dependency on arts
diff --git a/chat-im/carrier/DEPENDS b/chat-im/carrier/DEPENDS
index 780faab..548e175 100755
--- a/chat-im/carrier/DEPENDS
+++ b/chat-im/carrier/DEPENDS
@@ -77,11 +77,6 @@ optional_depends dbus \
"--disable-dbus" \
"for DBUS support" &&
-optional_depends howl \
- '' \
- '' \
- 'for network ZeroConf in Bonjour plugin' &&
-
optional_depends xscreensaver \
"" \
"--disable-screensaver" \
diff --git a/chat-im/carrier/HISTORY b/chat-im/carrier/HISTORY
index f829a04..437a3bf 100644
--- a/chat-im/carrier/HISTORY
+++ b/chat-im/carrier/HISTORY
@@ -1,3 +1,6 @@
+2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: removed optional_depends howl
+
2009-01-10 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 2.5.3
diff --git a/chat-im/pidgin/DEPENDS b/chat-im/pidgin/DEPENDS
index 7f60e21..cd68e76 100755
--- a/chat-im/pidgin/DEPENDS
+++ b/chat-im/pidgin/DEPENDS
@@ -72,11 +72,6 @@ optional_depends libsm \
'--disable-sm' \
'for X11 session management' &&
-optional_depends howl \
- '' \
- '' \
- 'for network ZeroConf in Bonjour plugin' &&
-
optional_depends xscreensaver \
"" \
"--disable-screensaver" \
diff --git a/chat-im/pidgin/DETAILS b/chat-im/pidgin/DETAILS
index 2841bf4..24cc5ca 100755
--- a/chat-im/pidgin/DETAILS
+++ b/chat-im/pidgin/DETAILS
@@ -1,6 +1,6 @@
SPELL=pidgin
- VERSION=2.10.4
- SECURITY_PATCH=14
+ VERSION=2.10.5
+ SECURITY_PATCH=15
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index 3ced59a..8ba70d0 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,9 @@
+2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: removed optional-depends howl
+
+2012-07-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.10.5, SECURITY_PATCH=15
+
2012-05-07 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 2.10.4, SECURITY_PATCH=14
diff --git a/crypto/openssh/HISTORY b/crypto/openssh/HISTORY
index b8624ad..7f10685 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,6 @@
+2012-07-11 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: updated LPK patch to 6.0p1, from Gentoo
+
2012-04-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 6.0p1
diff --git a/crypto/openssh/PRE_BUILD b/crypto/openssh/PRE_BUILD
index 38764e6..86a99df 100755
--- a/crypto/openssh/PRE_BUILD
+++ b/crypto/openssh/PRE_BUILD
@@ -2,6 +2,6 @@ default_pre_build &&
if [ "${OPENSSH_LPK}" == "y" ]; then
cd "${SOURCE_DIRECTORY}" &&
- bzcat "${SCRIPT_DIRECTORY}"/openssh-lpk-5.9p1.patch.bz2 | patch -p1 &&
+ bzcat $SPELL_DIRECTORY/openssh-lpk-6.0p1-0.3.14.patch.bz2 | patch -p1 &&
autoconf
fi
diff --git a/crypto/openssh/openssh-lpk-5.9p1.patch.bz2
b/crypto/openssh/openssh-lpk-5.9p1.patch.bz2
deleted file mode 100644
index 1b97684..0000000
Binary files a/crypto/openssh/openssh-lpk-5.9p1.patch.bz2 and /dev/null differ
diff --git a/crypto/openssh/openssh-lpk-6.0p1-0.3.14.patch.bz2
b/crypto/openssh/openssh-lpk-6.0p1-0.3.14.patch.bz2
new file mode 100644
index 0000000..bc9e221
Binary files /dev/null and
b/crypto/openssh/openssh-lpk-6.0p1-0.3.14.patch.bz2 differ
diff --git a/database/mysql-workbench/DEPENDS
b/database/mysql-workbench/DEPENDS
index 72ca5b5..1c3b7e4 100755
--- a/database/mysql-workbench/DEPENDS
+++ b/database/mysql-workbench/DEPENDS
@@ -10,7 +10,7 @@ depends eggdbus &&
depends expat &&
depends fontconfig &&
depends freetype2 &&
-depends -sub CXX gcc &&
+depends -sub CXX gcc &&
depends gconf2 &&
depends glib2 &&
depends glibmm &&
@@ -18,7 +18,7 @@ depends gmp &&
depends gnome-vfs2 &&
depends gtk+2 &&
depends gtkmm2 &&
-depends howl &&
+depends -sub COMPAT_HOWL avahi &&
depends libbonobo &&
depends libgcrypt &&
depends libglade2 &&
diff --git a/database/mysql-workbench/HISTORY
b/database/mysql-workbench/HISTORY
index 0c7f1d8..5686f18 100644
--- a/database/mysql-workbench/HISTORY
+++ b/database/mysql-workbench/HISTORY
@@ -1,3 +1,6 @@
+2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: howl -> -sub COMPAT_HOWL avahi
+
2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: lua -> lua51
diff --git a/devel/automake/DETAILS b/devel/automake/DETAILS
index e236edd..ed11bc2 100755
--- a/devel/automake/DETAILS
+++ b/devel/automake/DETAILS
@@ -1,5 +1,6 @@
SPELL=automake
- VERSION=1.12
+ VERSION=1.12.2
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/automake/HISTORY b/devel/automake/HISTORY
index d3bcb67..a745ee6 100644
--- a/devel/automake/HISTORY
+++ b/devel/automake/HISTORY
@@ -1,3 +1,9 @@
+2012-07-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.12.2, SECURITY_PATCH=1, CVE-2012-3386
+
+2012-06-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.12.1
+
2012-04-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.12
diff --git a/devel/iasl/DETAILS b/devel/iasl/DETAILS
index cae8c38..3e5f295 100755
--- a/devel/iasl/DETAILS
+++ b/devel/iasl/DETAILS
@@ -1,9 +1,9 @@
SPELL=iasl
- VERSION=20120518
+ VERSION=20120711
SOURCE=acpica-unix-$VERSION.tar.gz
- SOURCE_URL[0]=https://www.acpica.org/download/acpica-unix-$VERSION.tar.gz
+ SOURCE_URL[0]=https://www.acpica.org/download/$SOURCE
SOURCE_HINTS="no-check-certificate"
-
SOURCE_HASH=sha512:3a7742a9fa2af1a141931596937ecadaf1d84b1c056e18d025f9735d83e72127a1ed6551e7fa51c17294c2e5e2fb8bc0b6e83aa70f7ad57507bed97c48675996
+
SOURCE_HASH=sha512:35913a814539fdda0a1787140faebfbf5a9441949893edf11268519e25c2a9c3e3950447f0e78874ac2a1db8c4707b3203fc806ac2ca57327861c5ec0eb950b3
SOURCE_DIRECTORY="$BUILD_DIRECTORY/acpica-unix-$VERSION"
LICENSE[0]=IASL
WEB_SITE=http://www.intel.com/technology/iapc/acpi/
diff --git a/devel/iasl/HISTORY b/devel/iasl/HISTORY
index e160c3c..9047cf2 100644
--- a/devel/iasl/HISTORY
+++ b/devel/iasl/HISTORY
@@ -1,3 +1,6 @@
+2012-07-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 20120711
+
2012-05-31 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 20120518; switched to https url
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index 4abdced..86811ba 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,6 @@
+2012-07-23 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD: unlock.patch now applies to stable branch only
+
2012-05-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD: apply the patch
diff --git a/disk/fuse/PRE_BUILD b/disk/fuse/PRE_BUILD
index c677cfb..dc1471d 100755
--- a/disk/fuse/PRE_BUILD
+++ b/disk/fuse/PRE_BUILD
@@ -2,17 +2,15 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-# part of revert of official commit 3743f3fe
-# that brakes our castfs staging system
-patch -p1 < "$SPELL_DIRECTORY/unlock.patch" &&
-
-if [ "$FUSE_BRANCH" != "scm" ]; then
- patch -p0 < "$SPELL_DIRECTORY/init.patch"
-fi &&
-
# glibc-2.14 fix
sed -i "/sched/s|<|<linux/|" util/fusermount.c &&
-if [ "$FUSE_BRANCH" = "scm" ]; then
+if [ "$FUSE_BRANCH" != "scm" ]; then
+ # part of revert of official commit 3743f3fe
+ # that brakes our castfs staging system
+ patch -p1 < "$SPELL_DIRECTORY/unlock.patch"
+ # prevent installing fuse initscript into the wrong place
+ patch -p0 < "$SPELL_DIRECTORY/init.patch"
+else
./makeconf.sh
fi
diff --git a/e-17/evas/DEPENDS b/e-17/evas/DEPENDS
index cda43be..07a4570 100755
--- a/e-17/evas/DEPENDS
+++ b/e-17/evas/DEPENDS
@@ -37,10 +37,10 @@ optional_depends directfb \
"--disable-directfb" \
"for DirectFB rendering backend" &&
-optional_depends sdl \
- "--enable-software-sdl" \
- "--disable-software-sdl" \
- "Enable software SDL rendering backend?" &&
+optional_depends sdl \
+ "--enable-software-16-sdl" \
+ "--disable-software-16-sdl" \
+ "Enable software 16bit SDL rendering backend?" &&
optional_depends xorg-libs \
"--enable-software-xlib --with-x" \
diff --git a/e-17/evas/HISTORY b/e-17/evas/HISTORY
index 9cdf2c0..f09afd2 100644
--- a/e-17/evas/HISTORY
+++ b/e-17/evas/HISTORY
@@ -1,3 +1,6 @@
+2012-07-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DEPENDS: configure options updated
+
2011-12-30 Ladislav Hagara <hgr AT vabo.cz>
* BUILD: --disable-wayland-{shm,egl} added
diff --git a/editors/gobby/DEPENDS b/editors/gobby/DEPENDS
index c407605..cdee0b3 100755
--- a/editors/gobby/DEPENDS
+++ b/editors/gobby/DEPENDS
@@ -2,4 +2,4 @@ depends obby &&
depends libxml++ &&
depends gtkmm2 &&
depends gtksourceview &&
-optional_depends howl
+optional_depends -sub COMPAT_HOWL avahi
diff --git a/editors/gobby/HISTORY b/editors/gobby/HISTORY
index 969ba0a..78cc167 100644
--- a/editors/gobby/HISTORY
+++ b/editors/gobby/HISTORY
@@ -1,3 +1,6 @@
+2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: howl -> -sub COMPAT_HOWL avahi
+
2011-09-25 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* B2CFCDD8.gpg: added gpg keyring
diff --git a/gnome2-apps/dia/DEPENDS b/gnome2-apps/dia/DEPENDS
index b566408..22b13f1 100755
--- a/gnome2-apps/dia/DEPENDS
+++ b/gnome2-apps/dia/DEPENDS
@@ -5,6 +5,7 @@ depends libxml2 &&
depends libxslt &&
depends libart_lgpl &&
depends xml-parser-expat &&
+depends docbook-xsl &&
optional_depends freetype2 \
"--with-freetype" \
diff --git a/gnome2-apps/dia/HISTORY b/gnome2-apps/dia/HISTORY
index 18f6dfc..aa37fb0 100644
--- a/gnome2-apps/dia/HISTORY
+++ b/gnome2-apps/dia/HISTORY
@@ -1,3 +1,7 @@
+2012-07-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: detect docbook-xsl man path and use instead of online one
+ * DEPENDS: added docbook-xsl required dep
+
2011-12-28 Julien "_kaze_" ROZO <julien AT rozo.org>
* glib-2.31.patch: added, to fix compilation issue with latest glib2
* PRE_BUILD: applying new patch
diff --git a/gnome2-apps/dia/PRE_BUILD b/gnome2-apps/dia/PRE_BUILD
index 958f6d3..c3f34d0 100755
--- a/gnome2-apps/dia/PRE_BUILD
+++ b/gnome2-apps/dia/PRE_BUILD
@@ -3,4 +3,11 @@ cd $BUILD_DIRECTORY &&
verify_file '' &&
xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
cd $SOURCE_DIRECTORY &&
+
+# dockbook's dir
+local DB_VER=$(installed_version docbook-xsl | cut -c -4) &&
+local DB_DIR="$INSTALL_ROOT/usr/share/xml/docbook/xsl-stylesheets-${DB_VER}"
&&
+
+sedit
"s:http\://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl:${DB_DIR}/manpages/docbook.xsl:"
configure &&
+
patch -p1 < $SPELL_DIRECTORY/glib-2.31.patch
diff --git a/gnome2-apps/gnome-user-share/DEPENDS
b/gnome2-apps/gnome-user-share/DEPENDS
index ae6c0b5..888d170 100755
--- a/gnome2-apps/gnome-user-share/DEPENDS
+++ b/gnome2-apps/gnome-user-share/DEPENDS
@@ -1,5 +1,5 @@
depends APACHE &&
-depends howl &&
+depends -sub COMPAT_HOWL avahi &&
depends gconf2 &&
depends gtk+2 &&
depends gnome-bluetooth &&
diff --git a/gnome2-apps/gnome-user-share/HISTORY
b/gnome2-apps/gnome-user-share/HISTORY
index 294cf96..9cc9c59 100644
--- a/gnome2-apps/gnome-user-share/HISTORY
+++ b/gnome2-apps/gnome-user-share/HISTORY
@@ -1,3 +1,6 @@
+2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: howl -> -sub COMPAT_HOWL avahi
+
2012-04-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.0.2
diff --git a/gnome2-libs/gnome-vfs2/DEPENDS b/gnome2-libs/gnome-vfs2/DEPENDS
index a800c04..ca15f81 100755
--- a/gnome2-libs/gnome-vfs2/DEPENDS
+++ b/gnome2-libs/gnome-vfs2/DEPENDS
@@ -31,11 +31,6 @@ optional_depends hal
\
"--disable-hal" \
"Enable hal support" &&
-optional_depends howl \
- "--enable-howl" \
- "--disable-howl" \
- "for Howl support" &&
-
optional_depends avahi \
"--enable-avahi" \
"--disable-avahi" \
diff --git a/gnome2-libs/gnome-vfs2/HISTORY b/gnome2-libs/gnome-vfs2/HISTORY
index e1cce9b..3250532 100644
--- a/gnome2-libs/gnome-vfs2/HISTORY
+++ b/gnome2-libs/gnome-vfs2/HISTORY
@@ -1,3 +1,6 @@
+2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: removed optional_depends howl
+
2011-02-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: corrected a lot of dependencies
diff --git a/gnome2-libs/libgnomeprint/HISTORY
b/gnome2-libs/libgnomeprint/HISTORY
index 25e9f74..9062b14 100644
--- a/gnome2-libs/libgnomeprint/HISTORY
+++ b/gnome2-libs/libgnomeprint/HISTORY
@@ -1,3 +1,8 @@
+2012-07-08 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: added, to apply patch
+ * stdio.patch: added, patch to apply missing header.
+ From gentoo.
+
2010-09-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.18.8
diff --git a/gnome2-libs/libgnomeprint/PRE_BUILD
b/gnome2-libs/libgnomeprint/PRE_BUILD
new file mode 100755
index 0000000..1055db2
--- /dev/null
+++ b/gnome2-libs/libgnomeprint/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/stdio.patch
diff --git a/gnome2-libs/libgnomeprint/stdio.patch
b/gnome2-libs/libgnomeprint/stdio.patch
new file mode 100644
index 0000000..dd91954
--- /dev/null
+++ b/gnome2-libs/libgnomeprint/stdio.patch
@@ -0,0 +1,9 @@
+--- a/libgnomeprint/modules/cups/gnome-print-cups-transport.c
++++ b/libgnomeprint/modules/cups/gnome-print-cups-transport.c
+@@ -34,6 +34,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <stdio.h>
+ #include <unistd.h>
+ #include <locale.h>
diff --git a/gnome2-libs/nautilus-dropbox/DEPENDS
b/gnome2-libs/nautilus-dropbox/DEPENDS
index e89d445..9e9514c 100755
--- a/gnome2-libs/nautilus-dropbox/DEPENDS
+++ b/gnome2-libs/nautilus-dropbox/DEPENDS
@@ -1 +1,2 @@
-depends nautilus2
+depends docutils &&
+depends nautilus2
diff --git a/gnome2-libs/nautilus-dropbox/HISTORY
b/gnome2-libs/nautilus-dropbox/HISTORY
index 7140a1c..bc56463 100644
--- a/gnome2-libs/nautilus-dropbox/HISTORY
+++ b/gnome2-libs/nautilus-dropbox/HISTORY
@@ -1,3 +1,6 @@
+2012-07-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on docutils
+
2011-08-26 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS, DETAILS: spell created
diff --git a/graphics-libs/fop/DETAILS b/graphics-libs/fop/DETAILS
index 8419516..10beb67 100755
--- a/graphics-libs/fop/DETAILS
+++ b/graphics-libs/fop/DETAILS
@@ -3,7 +3,7 @@
SOURCE=${SPELL}-${VERSION}-src.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL=${APACHE_URL}/xmlgraphics/fop/${SOURCE}
+
SOURCE_URL=http://archive.apache.org/dist/xmlgraphics/${SPELL}/source/${SOURCE}
SOURCE2_URL=${SOURCE_URL}.asc
SOURCE_GPG=fop.gpg:${SOURCE}.asc:UPSTREAM_KEY
SOURCE2_IGNORE=SIGNATURE
diff --git a/graphics-libs/fop/HISTORY b/graphics-libs/fop/HISTORY
index 7c9ae83..1108f8d 100644
--- a/graphics-libs/fop/HISTORY
+++ b/graphics-libs/fop/HISTORY
@@ -1,3 +1,6 @@
+2012-07-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated source url; since master Apache site is broken
+
2012-01-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0
diff --git a/graphics-libs/libpng/DETAILS b/graphics-libs/libpng/DETAILS
index cd467b2..e6cce2b 100755
--- a/graphics-libs/libpng/DETAILS
+++ b/graphics-libs/libpng/DETAILS
@@ -1,6 +1,6 @@
SPELL=libpng
- VERSION=1.2.49
-
SOURCE_HASH=sha512:afe1a1d4d73d1b4bb50e920fa31a0e9c78bfb1685f01329bb2096b1cdab809c55dde1122971b2ce1e961da1ff9789b00bf7023976b6ea17c6f05aa7bc9c9a5a4
+ VERSION=1.2.50
+
SOURCE_HASH=sha512:b10946abe973b3ffac3bfea305dfa0d9bfa5cb66545877ec7eb0c63f546f0e5f6de324cec66a442f08020fdbcae0044462e64d9cacde412acb10af95e6ea7514
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
@@ -8,12 +8,12 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
if [[ $ANI_PNG == y ]]; then
SOURCE2=$SPELL-$VERSION-apng.patch.gz
SOURCE2_URL[0]=$SOURCEFORGE_URL/$SPELL-apng/$SOURCE2
-
SOURCE2_HASH=sha512:8456888d3d6d6cfbc43b467620dd44b7c9f91352b6e0614434b8e5905a5bad84c3df70f95e919c1400916768a6d620f5628ecdb49d6c38931050288bc64768c3
+
SOURCE2_HASH=sha512:a666a39b3196a75e34c2b718aaf1fbd67574e63c4e2017c42cf5b4df5334c5c7a3a7a21bdd9fc4ce81bcf0fcbdc179c44987883c69243736e861ba278a020681
fi
LICENSE[0]=ZLIB
WEB_SITE=http://www.libpng.org/pub/png/libpng.html
ENTERED=20010922
- SECURITY_PATCH=8
+ SECURITY_PATCH=9
KEYWORDS="graphics libs"
SHORT="library that supports the PNG graphics format"
cat << EOF
diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY
index 8cc56d0..532f813 100644
--- a/graphics-libs/libpng/HISTORY
+++ b/graphics-libs/libpng/HISTORY
@@ -1,3 +1,6 @@
+2012-07-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.50, SECURITY_PATCH=9, CVE-2012-3386
+
2012-03-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.49, SECURITY_PATCH=8, CVE-2011-3048
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 38b8161..049209b 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=13.0.1
+ VERSION=14.0.1
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=13.0.1
+ VERSION=14.0.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -15,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=50
+ SECURITY_PATCH=51
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 93d567c..0c87bd4 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2012-07-18 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: 14.0.1, SECURITY_PATCH=51
+ * PRE_BUILD, installer.patch: added fix for
+ https://bugzilla.mozilla.org/show_bug.cgi?id=752895
+
2012-06-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 13.0.1, SECURITY_PATCH=50
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 8b10399..c993d21 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -9,7 +9,10 @@ patch -p0 < $SPELL_DIRECTORY/glyph.patch &&
# Archlinux patch to drop release point from install path
#
http://projects.archlinux.org/svntogit/packages.git/plain/trunk/firefox-install-dir.patch?h=packages/firefox
-patch -p1 < $SPELL_DIRECTORY/install_dir.patch &&
+patch -p1 < $SPELL_DIRECTORY/install_dir.patch &&
+
+# fixes https://bugzilla.mozilla.org/show_bug.cgi?id=752895
+patch -p1 < $SPELL_DIRECTORY/installer.patch &&
cp -v $SPELL_DIRECTORY/mozconfig .mozconfig &&
diff --git a/http/firefox/installer.patch b/http/firefox/installer.patch
new file mode 100644
index 0000000..d3232b5
--- /dev/null
+++ b/http/firefox/installer.patch
@@ -0,0 +1,112 @@
+# HG changeset patch
+# User Andrew Benton <b3nton AT gmail.com>
+# Date 1339485009 -7200
+# Node ID ede54971747f10b50e7d87e6236fe777ac12a070
+# Parent 253d5996845e9fd994dc9ee542d293fbc412ec56
+Bug 752895 - Don't try to install nspr, nss and sqlite when using system
libraries.
+r=glandium
+
+diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
+--- a/browser/installer/Makefile.in
++++ b/browser/installer/Makefile.in
+@@ -39,16 +39,24 @@ endif
+ ifdef MOZ_ENABLE_GNOME_COMPONENT
+ DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
+ endif
+
+ ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
+ DEFINES += -DMOZ_GTK2=1
+ endif
+
++ifdef MOZ_NATIVE_NSPR
++DEFINES += -DMOZ_NATIVE_NSPR=1
++endif
++
++ifdef MOZ_NATIVE_NSS
++DEFINES += -DMOZ_NATIVE_NSS=1
++endif
++
+ ifdef NSS_DISABLE_DBM
+ DEFINES += -DNSS_DISABLE_DBM=1
+ endif
+
+ ifdef _MSC_VER
+ DEFINES += -D_MSC_VER=$(_MSC_VER)
+ endif
+
+diff --git a/browser/installer/package-manifest.in
b/browser/installer/package-manifest.in
+--- a/browser/installer/package-manifest.in
++++ b/browser/installer/package-manifest.in
+@@ -53,19 +53,21 @@
+ #endif
+ @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
+ #ifdef MOZ_SHARED_MOZGLUE
+ @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
+ #endif
+ #ifndef MOZ_STATIC_JS
+ @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+ #endif
++#ifndef MOZ_NATIVE_NSPR
+ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
++#endif
+ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ #ifdef XP_MACOSX
+ @BINPATH@/XUL
+ #else
+ @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
+ #endif
+ #ifdef XP_MACOSX
+ @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
+@@ -104,17 +106,19 @@
+ @BINPATH@/@MOZ_APP_NAME@
+ #endif
+ @BINPATH@/application.ini
+ #ifdef MOZ_UPDATER
+ @BINPATH@/update-settings.ini
+ #endif
+ @BINPATH@/platform.ini
+ #ifndef XP_OS2
++#ifndef MOZ_NATIVE_SQLITE
+ @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
++#endif
+ #else
+ @BINPATH@/mozsqlt3@DLL_SUFFIX@
+ #endif
+ @BINPATH@/blocklist.xml
+ #ifdef XP_UNIX
+ @BINPATH@/run-mozilla.sh
+ #ifndef XP_MACOSX
+ @BINPATH@/mozilla-xremote-client
+@@ -578,26 +582,28 @@
+ @BINPATH@/components/dom_svg.xpt
+ @BINPATH@/components/dom_smil.xpt
+
+ ; [Personal Security Manager]
+ ;
+ ; NSS libraries are signed in the staging directory,
+ ; meaning their .chk files are created there directly.
+ ;
++#ifndef MOZ_NATIVE_NSS
+ @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
+ #ifndef NSS_DISABLE_DBM
+ @BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
+ #endif
+ @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
++#endif
+ @BINPATH@/chrome/pippki@JAREXT@
+ @BINPATH@/chrome/pippki.manifest
+ @BINPATH@/components/pipboot.xpt
+ @BINPATH@/components/pipnss.xpt
+ @BINPATH@/components/pippki.xpt
+
+ ; for Solaris SPARC
+ #ifdef SOLARIS
+
+
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 3fd454e..0ae5ed3 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,13 +1,13 @@
SPELL=seamonkey
- VERSION=2.10
+ VERSION=2.11
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:58ee8230174ac34183d68ed29baf3e601898fd5ba692de5856181fc48d0f96a022e17012d569960c75e640c00272e41aaa89ee3b0f34a561211fd22015a697d0
+
SOURCE_HASH=sha512:3ea0db394134e70f7900873f12496b13b9f621519bf0182dc0fb9b6b266d822b913770750e68fba64dcc2b25940799a16dabbb87a3ecf1ce8b19ed409925607d
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
SOURCE_URL[1]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
WEB_SITE=http://www.seamonkey-project.org/
- SECURITY_PATCH=43
+ SECURITY_PATCH=44
TMPFS=off
ENTERED=20010922
LICENSE[0]=MPL
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index ed60146..6d97762 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,9 @@
+2012-07-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.11, SECURITY_PATCH=44
+
+2012-06-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.10.1
+
2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.10; SECURITY_PATCH++
* PRE_BUILD: fixed packaging for usage with system libs
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 071eeb8..a9d4b4b 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,23 @@
+2012-07-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.38: added
+
+2012-07-21 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=3.5, LATEST_3=3.5
+ * info/kernels/3.5: added
+ * info/patches/maintenance_patches_3/patch-3.5: added
+
+2012-07-19 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.4.6
+ * info/patches/maintenance_patches_3/patch-3.4.6: added
+
+2012-07-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.37: added
+ * info/patches/maintenance_patches_3/patch-3.2.{20-23}: added
+
+2012-07-16 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.4.5
+ * info/patches/maintenance_patches_3/patch-3.4.5: added
+
2012-06-23 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.0.36: added
diff --git a/kernels/linux/info/kernels/3.5 b/kernels/linux/info/kernels/3.5
new file mode 100755
index 0000000..04d8cd9
--- /dev/null
+++ b/kernels/linux/info/kernels/3.5
@@ -0,0 +1,5 @@
+version="3.5"
+source="linux-${version}.tar.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+source2="linux-${version}.tar.sign"
+source2_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source2}"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.37
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.37
new file mode 100755
index 0000000..9b5f953
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.37
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.37"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="240dcdf7caffe12a892180e48cb8c8044069f348"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.38
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.38
new file mode 100755
index 0000000..8732a9b
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.38
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.38"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="b3dd64bea6c16d816928227960d122be62fa222c"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.20
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.20
new file mode 100755
index 0000000..4268ee4
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.20
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.20"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="b791793e66df63490b02e49eef796d67b3074eb9"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.21
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.21
new file mode 100755
index 0000000..4cd4d1f
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.21
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.21"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="76d97b1379ac9d30f4abb5d3205223545f6d7aa5"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.22
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.22
new file mode 100755
index 0000000..ea4b09f
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.22
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.22"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="3697ac16da70cef1c291f64074ec58a4e755b681"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.23
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.23
new file mode 100755
index 0000000..8c622f5
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.23
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.23"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="451fe4f54429dd3e2eca79745903b94cf5686271"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.5
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.5
new file mode 100755
index 0000000..c18460d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.5
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.5"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="c8afb0eb6d0dd716e8bddd236f9e577769f947e4"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.6
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.6
new file mode 100755
index 0000000..71cd9bc
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.6
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.6"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="d7d9ee7bf49e19a06cde34f3a54f608a658e4b40"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.5
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.5
new file mode 100755
index 0000000..ead378f
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.5
@@ -0,0 +1,5 @@
+patchversion="3.5.0"
+source=""
+source_url=""
+appliedkernels="3.5"
+md5sum=""
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 0478a86..b532346 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,8 +1,8 @@
-LATEST_3=3.4
+LATEST_3=3.5
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.4.4
+LATEST_maintenance_patches_3=patch-3.5
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/mobile/pilot-link/HISTORY b/mobile/pilot-link/HISTORY
index 0848c13..310c885 100644
--- a/mobile/pilot-link/HISTORY
+++ b/mobile/pilot-link/HISTORY
@@ -1,3 +1,7 @@
+2012-07-12 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: added, to apply patch
+ * perl.patch: added, to fix compilation with perl>=5.14
+
2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libusb => LIBUSB
diff --git a/mobile/pilot-link/PRE_BUILD b/mobile/pilot-link/PRE_BUILD
new file mode 100755
index 0000000..ec88f61
--- /dev/null
+++ b/mobile/pilot-link/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/perl.patch
diff --git a/mobile/pilot-link/perl.patch b/mobile/pilot-link/perl.patch
new file mode 100644
index 0000000..72d68d4
--- /dev/null
+++ b/mobile/pilot-link/perl.patch
@@ -0,0 +1,625 @@
+From ef1794b51e327cc80ec4cd95d6c97f954b912860 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni AT debian.org>
+Date: Sun, 10 Jul 2011 10:28:51 +0300
+Subject: [PATCH] Don't use PERL_POLLUTE macros
+
+The sv_yes, sv_no, sv_undef, etc. symbol names are compatibility
+macros that have been deprecated since Perl 5.6.
+
+Perl 5.14.0 removes support for defining PERL_POLLUTE to get these
+compatibility macros, so replace them all with the current names
+(PL_sv_yes, PL_sv_no, etc.) and don't define PERL_POLLUTE any more.
+
+This should work on all Perls since 5.6; it's been verified with 5.12.4
+and 5.14.0.
+---
+ bindings/Perl/Makefile.PL.in | 1 -
+ bindings/Perl/Pilot.xs | 158
+++++++++++++++++++++---------------------
+ bindings/Perl/typemap | 4 +-
+ 3 files changed, 81 insertions(+), 82 deletions(-)
+
+diff --git a/bindings/Perl/Makefile.PL.in b/bindings/Perl/Makefile.PL.in
+index 853e6eb..337cac0 100644
+--- a/bindings/Perl/Makefile.PL.in
++++ b/bindings/Perl/Makefile.PL.in
+@@ -39,7 +39,6 @@ WriteMakefile(
+ 'VERSION' =>
'@PILOT_LINK_VERS@.@PILOT_LINK_MAJOR@.@PILOT_LINK_MINOR@@PILOT_LINK_PATCH@',
+ 'XSPROTOARG' => '-noprototypes',
+ 'INC' => "-I$plincdir",
+- 'DEFINE' => '-DPERL_POLLUTE',
+ 'PREFIX' => "$prefix",
+ 'INSTALLDIRS'=> 'vendor',
+ 'dynamic_lib'=> {'OTHERLDFLAGS' => $lib},
+diff --git a/bindings/Perl/Pilot.xs b/bindings/Perl/Pilot.xs
+index 5a633ff..366d646 100644
+--- a/bindings/Perl/Pilot.xs
++++ b/bindings/Perl/Pilot.xs
+@@ -160,7 +160,7 @@ SvChar4(arg)
+
+ #define pack_dbinfo(arg, var, failure) { \
+ if (failure < 0) { \
+- arg = &sv_undef; \
++ arg = &PL_sv_undef; \
+ self->errnop = failure; \
+ } else { \
+ HV * i = newHV(); \
+@@ -214,15 +214,15 @@ SvChar4(arg)
+ var.createDate = (s = hv_fetch(i, "createDate", 10, 0)) ?
SvIV(*s) : 0;\
+ var.modifyDate = (s = hv_fetch(i, "modifyDate", 10, 0)) ?
SvIV(*s) : 0;\
+ var.backupDate = (s = hv_fetch(i, "backupDate", 10, 0)) ?
SvIV(*s) : 0;\
+- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0)
\
+- strncpy(var.name, SvPV(*s, na), sizeof(var.name));
\
++ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0)
\
++ strncpy(var.name, SvPV(*s, PL_na), sizeof(var.name));
\
+ } else {\
+ croak("argument is not a hash reference");
\
+ }
+
+ #define pack_userinfo(arg, var, failure) { \
+ if (failure < 0) { \
+- arg = &sv_undef; \
++ arg = &PL_sv_undef; \
+ self->errnop = failure; \
+ } else { \
+ HV * i = newHV(); \
+@@ -246,8 +246,8 @@ SvChar4(arg)
+ var.lastSyncPC = (s = hv_fetch(i, "lastSyncPC",
10, 0)) ? SvIV(*s) : 0;\
+ var.lastSyncDate = (s = hv_fetch(i, "lastSyncDate",
12, 0)) ? SvIV(*s) : 0;\
+ var.successfulSyncDate = (s = hv_fetch(i,
"successfulSyncDate", 18, 0)) ? SvIV(*s) : 0;\
+- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0)\
+- strncpy(var.username, SvPV(*s, na),
sizeof(var.username));\
++ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0)\
++ strncpy(var.username, SvPV(*s, PL_na),
sizeof(var.username));\
+ } else {\
+ croak("argument is not a hash reference");\
+ }
+@@ -287,7 +287,7 @@ SvChar4(arg)
+ }\
+ } else {\
+ self->errnop = result;\
+- PUSHs(&sv_undef);\
++ PUSHs(&PL_sv_undef);\
+ }
+
+ #define PackSI\
+@@ -329,7 +329,7 @@ SvChar4(arg)
+ }\
+ } else {\
+ self->errnop = result;\
+- PUSHs(&sv_undef);\
++ PUSHs(&PL_sv_undef);\
+ }
+
+ #define PackRecord {\
+@@ -421,7 +421,7 @@ SvChar4(arg)
+ }\
+ } else {\
+ self->errnop = result;\
+- PUSHs(&sv_undef);\
++ PUSHs(&PL_sv_undef);\
+ }
+
+ #define PackResource\
+@@ -473,7 +473,7 @@ SvChar4(arg)
+ }\
+ } else {\
+ self->errnop = result;\
+- PUSHs(&sv_undef);\
++ PUSHs(&PL_sv_undef);\
+ }
+
+ #define PackPref\
+@@ -536,7 +536,7 @@ SvChar4(arg)
+ croak("Unable to create resource");\
+ } else {\
+ self->errnop = result;\
+- PUSHs(&sv_undef);\
++ PUSHs(&PL_sv_undef);\
+ }
+
+ void doUnpackCategory(HV * self, struct CategoryAppInfo * c)
+@@ -576,7 +576,7 @@ void doPackCategory(HV * self, struct CategoryAppInfo *
c)
+
+ if ((s = hv_fetch(self, "categoryName", 12, 0)) && SvOK(*s) && SvRV(*s)
&& (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV))
+ for (i=0;i<16;i++)
+- strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) :
"", 16);
++ strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) :
"", 16);
+ else
+ for (i=0;i<16;i++)
+ strcpy(c->name[i], "");
+@@ -602,7 +602,7 @@ void doPackCategory(HV * self, struct CategoryAppInfo *
c)
+ int SvList(SV * arg, char **list)
+ {
+ int i;
+- char * str = SvPV(arg, na);
++ char * str = SvPV(arg, PL_na);
+ for (i=0;list[i];i++)
+ if (strcasecmp(list[i], str)==0)
+ return i;
+@@ -781,11 +781,11 @@ Pack(record)
+ croak("Invalid advance unit %d encountered", u);
+ }
+ } else {
+- if (strEQ(SvPV(*s, na), "minutes"))
++ if (strEQ(SvPV(*s, PL_na), "minutes"))
+ u = 0;
+- else if (strEQ(SvPV(*s, na), "hours"))
++ else if (strEQ(SvPV(*s, PL_na), "hours"))
+ u = 1;
+- else if (strEQ(SvPV(*s, na), "days"))
++ else if (strEQ(SvPV(*s, PL_na), "days"))
+ u = 2;
+ else
+ croak("Invalid advance unit %d encountered", u);
+@@ -850,10 +850,10 @@ Pack(record)
+ }
+ }
+
+- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) :
0;
++ a.description = (s = hv_fetch(h, "description", 11, 0)) ?
SvPV(*s,PL_na) : 0;
+ if (!a.description)
+ croak("appointments must contain a description");
+- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0;
++ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0;
+
+ if (pack_Appointment(&a, &pibuf, datebook_v1) < 0) {
+ croak("pack_Appointment failed");
+@@ -897,7 +897,7 @@ UnpackAppBlock(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ doUnpackCategory(ret, &a.category);
+
+@@ -1023,8 +1023,8 @@ Pack(record)
+ a.indefinite = 1;
+ }
+
+- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) :
0;
+- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0;
++ a.description = (s = hv_fetch(h, "description", 11, 0)) ?
SvPV(*s,PL_na) : 0;
++ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0;
+
+ if (pack_ToDo(&a, &pibuf, todo_v1) < 0) {
+ croak("pack_ToDo failed");
+@@ -1065,7 +1065,7 @@ UnpackAppBlock(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ doUnpackCategory(ret, &a.category);
+
+@@ -1160,7 +1160,7 @@ Unpack(record)
+ hv_store(ret, "entry", 5, newRV_noinc((SV*)e), 0);
+
+ for (i=0;i<19;i++) {
+- av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &sv_undef);
++ av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &PL_sv_undef);
+ }
+
+ hv_store(ret, "showPhone", 9, newSViv(a.showPhone), 0);
+@@ -1200,7 +1200,7 @@ Pack(record)
+
+ if ((s = hv_fetch(h, "entry", 5, 0)) && SvOK(*s) && SvRV(*s) &&
(SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV))
+ for (i=0;i<19;i++)
+- a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ?
SvPV(*s,na) : 0;
++ a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ?
SvPV(*s,PL_na) : 0;
+ else
+ for (i=0;i<19;i++)
+ a.entry[i] = 0;
+@@ -1249,7 +1249,7 @@ UnpackAppBlock(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ doUnpackCategory(ret, &a.category);
+
+@@ -1309,13 +1309,13 @@ PackAppBlock(record)
+ a.sortByCompany = (s = hv_fetch(h, "sortByCompany", 13, 0)) ? SvIV(*s)
: 0;
+
+ if ((s = hv_fetch(h, "label", 5, 0)) && SvOK(*s) && SvRV(*s) &&
(SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV))
+- for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ?
SvPV(*s,na) : "", 16);
++ for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ?
SvPV(*s,PL_na) : "", 16);
+ else
+ for (i=0;i<22;i++) a.labels[i][0] = 0;
+ for (i=0;i<22;i++) a.labels[i][15] = 0;
+
+ if ((s = hv_fetch(h, "phoneLabel", 10, 0)) && SvOK(*s) && SvRV(*s) &&
(SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV))
+- for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ?
SvPV(*s,na) : "", 16);
++ for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ?
SvPV(*s,PL_na) : "", 16);
+ else
+ for (i=0;i<8;i++) a.phoneLabels[i][0] = 0;
+ for (i=0;i<8;i++) a.phoneLabels[i][15] = 0;
+@@ -1396,7 +1396,7 @@ Pack(record)
+ else {
+
+ if ((s = hv_fetch(h, "text", 4, 0)))
+- a.text = SvPV(*s,na);
++ a.text = SvPV(*s,PL_na);
+ else
+ a.text = 0;
+
+@@ -1438,7 +1438,7 @@ UnpackAppBlock(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ doUnpackCategory(ret, &a.category);
+
+@@ -1510,7 +1510,7 @@ Unpack(record)
+
+ SvPV(record,len);
+ if (len > 0) { /* len == 0 if deleted flag is set */
+- if (unpack_Expense(&e, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_Expense(&e, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ hv_store(ret, "date", 4, newRV_noinc((SV*)tmtoav(&e.date)), 0);
+ hv_store(ret, "type", 4, newSVlist(e.type,ExpenseTypeNames),0);
+@@ -1570,15 +1570,15 @@ Pack(record)
+ avtotm((AV*)SvRV(*s), &e.date);
+ else
+ croak("expense record must contain date");
+- if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,na);
++ if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,PL_na);
+ else e.amount = 0;
+- if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,na);
++ if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,PL_na);
+ else e.vendor = 0;
+- if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,na);
++ if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,PL_na);
+ else e.city = 0;
+- if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,na);
++ if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,PL_na);
+ else e.attendees = 0;
+- if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,na);
++ if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,PL_na);
+ else e.note = 0;
+
+ len = pack_Expense(&e, mybuf, 0xffff);
+@@ -1619,7 +1619,7 @@ UnpackAppBlock(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ hv_store(ret, "sortOrder", 9,
newSVlist(e.sortOrder,ExpenseSortNames),0);
+ a = newAV();
+@@ -1662,15 +1662,15 @@ PackAppBlock(record)
+ HV * hv;
+ if ((s=av_fetch(av, i, 0)) && SvOK(*s) && SvRV(*s) &&
(SvTYPE(hv=(HV*)SvRV(*s))==SVt_PVHV)) {
+ if (s = hv_fetch(hv, "name", 4, 0)) {
+- strncpy(e.currencies[i].name,
SvPV(*s, na), 16);
++ strncpy(e.currencies[i].name,
SvPV(*s, PL_na), 16);
+ e.currencies[i].name[15] = 0;
+ }
+ if (s = hv_fetch(hv, "symbol", 6, 0)) {
+- strncpy(e.currencies[i].symbol,
SvPV(*s, na), 4);
++ strncpy(e.currencies[i].symbol,
SvPV(*s, PL_na), 4);
+ e.currencies[i].symbol[3] = 0;
+ }
+ if (s = hv_fetch(hv, "rate", 4, 0)) {
+- strncpy(e.currencies[i].rate,
SvPV(*s, na), 8);
++ strncpy(e.currencies[i].rate,
SvPV(*s, PL_na), 8);
+ e.currencies[i].rate[7] = 0;
+ }
+ }
+@@ -1718,7 +1718,7 @@ UnpackPref(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_ExpensePref(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_ExpensePref(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ hv_store(ret, "unitOfDistance", 14, newSVlist(a.unitOfDistance,
ExpenseDistanceNames), 0);
+ hv_store(ret, "currentCategory", 15, newSViv(a.currentCategory),
0);
+@@ -1811,7 +1811,7 @@ Unpack(record)
+
+ SvPV(record,len);
+ if (len > 0) { /* len == 0 if deleted flag is set */
+- if (unpack_Mail(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_Mail(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ if (a.subject) hv_store(ret, "subject", 7, newSVpv(a.subject,0),
0);
+ if (a.from) hv_store(ret, "from", 4, newSVpv(a.from,0), 0);
+@@ -1858,14 +1858,14 @@ Pack(record)
+ }
+ else {
+
+- a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,na) : 0;
+- a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,na) : 0;
+- a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,na) : 0;
+- a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,na) : 0;
+- a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,na) : 0;
+- a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,na) : 0;
+- a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,na) : 0;
+- a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,na) : 0;
++ a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,PL_na) : 0;
++ a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,PL_na) : 0;
++ a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,PL_na) : 0;
++ a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,PL_na) : 0;
++ a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,PL_na) : 0;
++ a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,PL_na) : 0;
++ a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,PL_na) : 0;
++ a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,PL_na) : 0;
+
+ a.read = (s = hv_fetch(h, "read", 4, 0)) ? SvIV(*s) : 0;
+ a.signature = (s = hv_fetch(h, "signature", 9, 0)) ? SvIV(*s) : 0;
+@@ -1913,7 +1913,7 @@ UnpackAppBlock(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ doUnpackCategory(ret, &a.category);
+
+@@ -1989,7 +1989,7 @@ UnpackSyncPref(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ hv_store(ret, "syncType", 8, newSVlist(a.syncType,
MailSyncTypeNames), 0);
+ hv_store(ret, "getHigh", 7, newSViv(a.getHigh), 0);
+@@ -2033,9 +2033,9 @@ PackSyncPref(record, id)
+ a.getContaining = (s=hv_fetch(h,"getContaining",13,0)) ? SvIV(*s) : 0;
+ a.truncate = (s=hv_fetch(h,"truncate",8,0)) ? SvIV(*s) : 0;
+
+- a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,na) : 0;
+- a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,na) : 0;
+- a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ? SvPV(*s,na)
: 0;
++ a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,PL_na) : 0;
++ a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,PL_na) : 0;
++ a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ?
SvPV(*s,PL_na) : 0;
+
+ len = pack_MailSyncPref(&a, mybuf, 0xffff);
+
+@@ -2073,7 +2073,7 @@ UnpackSignaturePref(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ if (a.signature)
+ hv_store(ret, "signature", 9, newSVpv(a.signature, 0), 0);
+@@ -2099,7 +2099,7 @@ PackSignaturePref(record, id)
+ RETVAL = record;
+ else {
+
+- a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,na) : 0;
++ a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,PL_na) : 0;
+
+ len = pack_MailSignaturePref(&a, mybuf, 0xffff);
+
+@@ -2129,7 +2129,7 @@ write(socket, msg)
+ {
+ STRLEN len;
+ SvPV(msg, len);
+- RETVAL = pi_write(socket,SvPV(msg,na),len);
++ RETVAL = pi_write(socket,SvPV(msg,PL_na),len);
+ }
+
+ SV *
+@@ -2146,7 +2146,7 @@ read(socket, len)
+ if (result >=0)
+ RETVAL = newSVpvn((char *) pibuf.data, result);
+ else
+- RETVAL = &sv_undef;
++ RETVAL = &PL_sv_undef;
+ }
+ OUTPUT:
+ RETVAL
+@@ -2282,7 +2282,7 @@ class(self, name=0)
+ croak("DBClasses doesn't exist");
+ if (SvOK(name)) {
+ (void)SvPV(name,len);
+- s = hv_fetch(h, SvPV(name,na), len, 0);
++ s = hv_fetch(h, SvPV(name,PL_na), len, 0);
+ }
+ if (!s)
+ s = hv_fetch(h, "", 0, 0);
+@@ -2577,7 +2577,7 @@ getRecords(self)
+ {
+ int result = dlp_ReadOpenDBInfo(self->socket, self->handle,
&RETVAL);
+ if (result < 0) {
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ self->errnop = result;
+ }
+ }
+@@ -2745,7 +2745,7 @@ setResource(self, data)
+ result = dlp_WriteResource(self->socket, self->handle, type,
id, c, len);
+ if (result < 0) {
+ self->errnop = result;
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ } else
+ RETVAL = newSViv(result);
+ }
+@@ -2798,7 +2798,7 @@ getPref(self, id=0, backup=1)
+ r = dlp_CloseDB(self->socket, self->handle);
+ result = dlp_ReadAppPreference(self->socket, creator, id, backup,
0xFFFF, mybuf, &len, &version);
+ if (pi_version(self->socket)< 0x101)
+- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode,
SvPV(self->dbname,na), &self->handle);
++ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode,
SvPV(self->dbname,PL_na), &self->handle);
+ ReturnReadPref(mybuf, len);
+ }
+
+@@ -2822,10 +2822,10 @@ setPref(self, data)
+ r = dlp_CloseDB(self->socket, self->handle);
+ result = dlp_WriteAppPreference(self->socket, creator, id,
backup, version, buf, len);
+ if (pi_version(self->socket)< 0x101)
+- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode,
SvPV(self->dbname,na), &self->handle);
++ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode,
SvPV(self->dbname,PL_na), &self->handle);
+ if (result < 0) {
+ self->errnop = result;
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ } else {
+ RETVAL = newSViv(result);
+ }
+@@ -2861,7 +2861,7 @@ setPrefRaw(self, data, number, version, backup=1)
+ result = dlp_WriteAppPreference(self->socket, creator, number,
backup, version, buf, len);
+ if (result < 0) {
+ self->errnop = result;
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ } else {
+ RETVAL = newSViv(result);
+ }
+@@ -2904,7 +2904,7 @@ getTime(self)
+ int result = dlp_GetSysDateTime(self->socket, &t);
+ if (result < 0) {
+ self->errnop = result;
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ } else
+ RETVAL = newSViv(t);
+ }
+@@ -2929,7 +2929,7 @@ getSysInfo(self)
+ int result = dlp_ReadSysInfo(self->socket, &si);
+ if (result < 0) {
+ self->errnop = result;
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ } else {
+ HV * i = newHV();
+ hv_store(i, "romVersion", 10, newSViv(si.romVersion),
0);\
+@@ -2951,7 +2951,7 @@ getCardInfo(self, cardno=0)
+ int result = dlp_ReadStorageInfo(self->socket, cardno, &c);
+ if (result < 0) {
+ self->errnop = result;
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ } else {
+ HV * i = newHV();
+ hv_store(i, "card", 6, newSViv(c.card), 0);\
+@@ -3037,7 +3037,7 @@ newPref(self, creator, id=0, version=0, backup=0)
+ croak("Default PrefClass not defined");
+ PUSHMARK(sp);
+ XPUSHs(newSVsv(*s));
+- XPUSHs(&sv_undef);
++ XPUSHs(&PL_sv_undef);
+ XPUSHs(sv_2mortal(newSVChar4(creator)));
+ if (id)
+ XPUSHs(id);
+@@ -3107,7 +3107,7 @@ open(self, name, mode=0, cardno=0)
+ result = dlp_OpenDB(self->socket, cardno, nummode, name,
&handle);
+ if (result<0) {
+ self->errnop = result;
+- RETVAL = &sv_undef;
++ RETVAL = &PL_sv_undef;
+ } else {
+ int type;
+ PDA__Pilot__DLP__DB * x =
malloc(sizeof(PDA__Pilot__DLP__DB));
+@@ -3156,7 +3156,7 @@ create(self, name, creator, type, flags, version,
cardno=0)
+ int result = dlp_CreateDB(self->socket, creator, type,
cardno, flags, version, name, &handle);
+ if (result<0) {
+ self->errnop = result;
+- RETVAL = &sv_undef;
++ RETVAL = &PL_sv_undef;
+ } else {
+ PDA__Pilot__DLP__DB * x =
malloc(sizeof(PDA__Pilot__DLP__DB));
+ SV * sv = newSViv((IV)(void*)x);
+@@ -3224,7 +3224,7 @@ setPref(self, data)
+ result = dlp_WriteAppPreference(self->socket, creator, id,
backup, version, buf, len);
+ if (result < 0) {
+ self->errnop = result;
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ } else {
+ RETVAL = newSViv(result);
+ }
+@@ -3248,7 +3248,7 @@ setPrefRaw(self, data, creator, number, version,
backup=1)
+ result = dlp_WriteAppPreference(self->socket, creator, number,
backup, version, buf, len);
+ if (result < 0) {
+ self->errnop = result;
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ } else {
+ RETVAL = newSViv(result);
+ }
+@@ -3350,7 +3350,7 @@ findDBInfo(self, start, name, creator, type, cardno=0)
+ else
+ t = 0;
+ result = dlp_FindDBInfo(self->socket, cardno, start,
+- SvOK(name) ? SvPV(name,na) : 0,
++ SvOK(name) ? SvPV(name,PL_na) : 0,
+ t, c, &info);
+ pack_dbinfo(RETVAL, info, result);
+ }
+@@ -3367,7 +3367,7 @@ getFeature(self, creator, number)
+ unsigned long f;
+ int result;
+ if ((result = dlp_ReadFeature(self->socket, creator, number,
&f))<0) {
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ self->errnop = result;
+ } else {
+ RETVAL = newSViv(f);
+@@ -3397,7 +3397,7 @@ getROMToken(self,token)
+ }
+
+ void
+-callApplication(self, creator, type, action, data=&sv_undef)
++callApplication(self, creator, type, action, data=&PL_sv_undef)
+ PDA::Pilot::DLP *self
+ Char4 creator
+ Char4 type
+@@ -3410,7 +3410,7 @@ callApplication(self, creator, type, action,
data=&sv_undef)
+ int result;
+ (void)SvPV(data,len);
+ result = dlp_CallApplication(self->socket, creator,
+- type, action, len, SvPV(data,na),
++ type, action, len, SvPV(data,PL_na),
+ &retcode, &pibuf);
+ EXTEND(sp, 2);
+ if (result >= 0) {
+@@ -3419,7 +3419,7 @@ callApplication(self, creator, type, action,
data=&sv_undef)
+ PUSHs(sv_2mortal(newSViv(retcode)));
+ }
+ } else
+- PUSHs(&sv_undef);
++ PUSHs(&PL_sv_undef);
+ }
+
+ int
+@@ -3530,7 +3530,7 @@ class(self, name=0)
+ croak("DBClasses doesn't exist");
+ if (SvOK(name)) {
+ (void)SvPV(name, len);
+- s = hv_fetch(h, SvPV(name, na), len, 0);
++ s = hv_fetch(h, SvPV(name, PL_na), len, 0);
+ }
+ if (!s)
+ s = hv_fetch(h, "", 0, 0);
+diff --git a/bindings/Perl/typemap b/bindings/Perl/typemap
+index 347a6a7..eeffa4c 100644
+--- a/bindings/Perl/typemap
++++ b/bindings/Perl/typemap
+@@ -50,9 +50,9 @@ T_CHAR4
+
+ T_RESULT
+ if ($var < 0) {
+- sv_setsv($arg, &sv_no);
++ sv_setsv($arg, &PL_sv_no);
+ self->errnop = $var;
+ } else
+- sv_setsv($arg, &sv_yes);
++ sv_setsv($arg, &PL_sv_yes);
+ T_PTROBJ
+ sv_setref_pv($arg, \"${ntype}\", (void*)$var);
+--
+1.7.5.4
+
diff --git a/net/bind-tools/DETAILS b/net/bind-tools/DETAILS
index 563f451..e6d720b 100755
--- a/net/bind-tools/DETAILS
+++ b/net/bind-tools/DETAILS
@@ -1,12 +1,12 @@
SPELL=bind-tools
- VERSION=9.9.0
+ VERSION=9.9.1-P2
SOURCE=bind-$VERSION.tar.gz
SOURCE2=$SOURCE.sha512.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/bind-$VERSION"
SOURCE_URL[0]=ftp://ftp.isc.org/isc/bind9/$VERSION/$SOURCE
SOURCE2_URL[0]=ftp://ftp.isc.org/isc/bind9/$VERSION/$SOURCE2
SOURCE2_IGNORE=signature
- SECURITY_PATCH=8
+ SECURITY_PATCH=9
SOURCE_GPG=isc.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=ISC
KEYWORDS="net"
diff --git a/net/bind-tools/HISTORY b/net/bind-tools/HISTORY
index 1be80d7..9efb7e2 100644
--- a/net/bind-tools/HISTORY
+++ b/net/bind-tools/HISTORY
@@ -1,3 +1,6 @@
+2012-07-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 9.9.1-P2; SECURITY_PATCH++
+
2012-03-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 9.9.0
diff --git a/net/howl/BUILD b/net/howl/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/howl/BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/howl/DETAILS b/net/howl/DETAILS
index 6cfdc65..bcc283b 100755
--- a/net/howl/DETAILS
+++ b/net/howl/DETAILS
@@ -1,15 +1,7 @@
- SPELL=howl
- VERSION=0.9.8
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.porchdogsoft.com/download/$SOURCE
- WEB_SITE=http://www.porchdogsoft.com/products/howl
-
SOURCE_HASH=sha512:047fb081b17e23d173d6987dbe6d877b6a677586f478599b0a01f7cf23ecd2222f3f2b71b5b18c2508d06b2cfbb3a55eaf5d70b0bd9dcc4fa27d8a841eea3cde
- LICENSE[0]=GPL
- ENTERED=20040915
- KEYWORDS="net"
- SHORT="Howl is a cross-platform implementation of Zeroconf
networking"
-cat << EOF
-Howl is a cross-platform implementation of Zeroconf networking. Zeroconf
brings
-a new ease of use to IP networking.
-EOF
+ SPELL=howl
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by avahi]
+ EOF
diff --git a/net/howl/DOWNLOAD b/net/howl/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/howl/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/net/howl/HISTORY b/net/howl/HISTORY
index 04d67c8..def62e7 100644
--- a/net/howl/HISTORY
+++ b/net/howl/HISTORY
@@ -1,3 +1,8 @@
+2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * spell deprecated [Replaced by avahi and no longer compiles for me.]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2007-10-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD, kernel-headers.patch: added patch to compile with current
kernel headers, bug #14028
diff --git a/net/howl/INSTALL b/net/howl/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/howl/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/net/howl/PRE_BUILD b/net/howl/PRE_BUILD
index ee1c3df..27ba77d 100755
--- a/net/howl/PRE_BUILD
+++ b/net/howl/PRE_BUILD
@@ -1,4 +1 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sedit "s:-@VERSION@::" howl.pc.in &&
-patch -p0 < $SCRIPT_DIRECTORY/kernel-headers.patch
+true
diff --git a/net/howl/UP_TRIGGERS b/net/howl/UP_TRIGGERS
new file mode 100755
index 0000000..19f6dbd
--- /dev/null
+++ b/net/howl/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger howl dispel_self
+up_trigger avahi cast_self
diff --git a/net/howl/kernel-headers.patch b/net/howl/kernel-headers.patch
deleted file mode 100644
index a460669..0000000
--- a/net/howl/kernel-headers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/lib/howl/Posix/posix_interface.c.orig 2007-10-03 10:50:56.000000000
+0200
-+++ src/lib/howl/Posix/posix_interface.c 2007-10-03 10:51:02.000000000
+0200
-@@ -41,6 +41,10 @@
- typedef __uint32_t u32;
- typedef __uint16_t u16;
- typedef __uint8_t u8;
-+typedef uint64_t __u64;
-+typedef uint32_t __u32;
-+typedef uint16_t __u16;
-+typedef uint8_t __u8;
- # include <linux/sockios.h>
- # include <linux/ethtool.h>
- #endif
diff --git a/net/nsd/DETAILS b/net/nsd/DETAILS
index 4eecebb..b25ada8 100755
--- a/net/nsd/DETAILS
+++ b/net/nsd/DETAILS
@@ -1,9 +1,9 @@
SPELL=nsd
- VERSION=3.2.10
- SECURITY_PATCH=1
+ VERSION=3.2.13
+ SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.nlnetlabs.nl/downloads/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:a96ebd73c9bc5c6f6fa994f326fb7f901bf6e4329ce9e5b2fe0b7eead527a7690125831f509acecf089a951030a78953b6ba0e1179aaa844ec72204f0cd8fa54
+
SOURCE_HASH=sha512:e04dc46e974002af70cb53d33ef0e00dabce5b84f4c613257ae8d56e91e863dbe6f13386381a2c7643c9c501f4ec002394815ae6bd55a1f3e065fbef03469b1d
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.nlnetlabs.nl/projects/nsd/
LICENSE[0]=BSD
diff --git a/net/nsd/HISTORY b/net/nsd/HISTORY
index 1a46c94..1248481 100644
--- a/net/nsd/HISTORY
+++ b/net/nsd/HISTORY
@@ -1,3 +1,9 @@
+2012-07-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.2.13; SECURITY_PATCH++ (CVE-2012-2979)
+
+2012-07-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.2.12; SECURITY_PATCH++ (CVE-2012-2978)
+
2012-02-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.2.10
diff --git a/net/samba/DEPENDS b/net/samba/DEPENDS
index 82a5b65..2d7e83e 100755
--- a/net/samba/DEPENDS
+++ b/net/samba/DEPENDS
@@ -1,5 +1,4 @@
depends e2fsprogs &&
-depends libcap &&
depends popt "--without-included-popt" &&
if [[ "$SAMBA_AD" == "y" ]]; then
@@ -12,6 +11,23 @@ else
"for LDAP support"
fi &&
+optional_depends talloc \
+ "--enable-external-libtalloc" \
+ "--disable-external-libtalloc" \
+ "to use system talloc library" &&
+
+optional_depends tdb \
+ "--enable-external-libtdb" \
+ "--disable-external-libtdb" \
+ "to use system tdb library" &&
+
+optional_depends libcap "" "" "for POSIX capability support" &&
+
+optional_depends dmapi \
+ "--with-dmapi" \
+ "--without-dmapi" \
+ "for DMAPI/XDSM support" &&
+
optional_depends readline \
"--with-readline" \
"--without-readline" \
@@ -22,10 +38,15 @@ optional_depends linux-pam \
"--without-pam" \
"To enable PAM authentication" &&
-#optional_depends openssl \
-# "--with-ssl" \
-# "--without-ssl" \
-# "for encrypted communication" &&
+optional_depends fam \
+ "--enable-fam" \
+ "--disable-fam" \
+ "for FAM support" &&
+
+optional_depends avahi \
+ "--enable-avahi" \
+ "--disable-avahi" \
+ "for Avahi support" &&
optional_depends CUPS \
"--enable-cups" \
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index e308f5c..6300db9 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,5 +1,7 @@
SPELL=samba
VERSION=3.6.5
+ SECURITY_PATCH=18
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.samba.org/samba/ftp/$SOURCE
@@ -12,7 +14,6 @@ if [[ "$SAMBA_VSCAN" == "y" ]] ; then
SOURCE2_URL[0]=http://www.openantivirus.org/download/$SOURCE2
SOURCE2_HASH=sha512:6a4d6f9c033777a54af19f5e4d637ba0515cfb6ca3c815357d8ee4d735586f372d9b7e2b315a783be21ce524aa6f39e1536f91031f496acffbda225a6c8a996f
fi
- SECURITY_PATCH=18
LICENSE[0]=GPL
WEB_SITE=http://www.samba.org/
KEYWORDS="net"
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index a439ac3..8734fe8 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,11 @@
+2012-07-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * init.d/samba: fixed bug about start/stop for a long time when
running
+ plenty of services; added 445 default tcp port; cleaned up restart()
+
+2012-07-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: libcap becomes optional; added missing optional deps
+
2012-05-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.6.5, SECURITY_PATCH=18, CVE-2012-2111
diff --git a/net/samba/init.d/samba b/net/samba/init.d/samba
index 1db8804..b521886 100644
--- a/net/samba/init.d/samba
+++ b/net/samba/init.d/samba
@@ -14,12 +14,12 @@ start()
if [ ! -e /var/run/samba ]; then
mkdir /var/run/samba
fi &&
- if ! netstat -l --udp | grep -q netbios-ns ; then
+ if ! netstat -nl --udp | grep -q ":137" ; then
echo "Starting NetBIOS nameserver ..."
loadproc /usr/sbin/nmbd ${ARGS}
evaluate_retval
fi &&
- if ! netstat -l --tcp | grep -q netbios-ssn ; then
+ if ! netstat -nl --tcp | grep -q ":139\|:445" ; then
echo "Starting NetBIOS sessions ..."
loadproc /usr/sbin/smbd ${ARGS}
evaluate_retval
@@ -28,14 +28,14 @@ start()
#
stop()
{
- if netstat -l --udp | grep -q netbios-ns ; then
+ if netstat -nl --udp | grep -q ":137" ; then
if ps -C nmbd | grep -q nmbd ; then
echo "Stopping NetBIOS nameserver ..."
killproc /usr/sbin/nmbd
evaluate_retval
fi
fi &&
- if netstat -l --tcp | grep -q netbios-ssn ; then
+ if netstat -nl --tcp | grep -q ":139\|:445" ; then
if ps -C smbd | grep -q smbd; then
echo "Stopping NetBIOS sessions ..."
killproc /usr/sbin/smbd
@@ -46,7 +46,7 @@ stop()
#
status()
{
- if netstat -l --udp | grep -q netbios-ns ; then
+ if netstat -nl --udp | grep -q ":137" ; then
if ! ps -C nmbd | grep -q nmbd; then
echo "NetBIOS nameserver : xinetd"
evaluate_retval
@@ -56,7 +56,7 @@ status()
evaluate_retval
fi
fi &&
- if netstat -l --tcp | grep -q netbios-ssn ; then
+ if netstat -nl --tcp | grep -q ":139\|:445" ; then
if ! ps -C smbd | grep -q smbd ; then
echo "NetBIOS sessions : xinetd"
evaluate_retval
@@ -68,9 +68,8 @@ status()
fi
}
-restart(){
-
- stop &&
-
- start
+restart() {
+ stop &&
+ sleep 1 &&
+ start
}
diff --git a/net/xinetd/DEPENDS b/net/xinetd/DEPENDS
index d553bab..6bc3731 100755
--- a/net/xinetd/DEPENDS
+++ b/net/xinetd/DEPENDS
@@ -8,7 +8,7 @@ optional_depends tcp_wrappers
\
#
# The --without-howl doesn't quite enforce not using howl ;/
#
-optional_depends howl \
+optional_depends -sub COMPAT_HOWL avahi \
'--with-howl' \
'--without-howl' \
'for Zeroconf network support'
diff --git a/net/xinetd/HISTORY b/net/xinetd/HISTORY
index 0bf8b65..d4cab25 100644
--- a/net/xinetd/HISTORY
+++ b/net/xinetd/HISTORY
@@ -1,3 +1,6 @@
+2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: howl -> -sub COMPAT_HOWL avahi
+
2012-05-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.3.15; SECURITY_PATCH++ (CVE-2012-0862)
diff --git a/security-libs/linux-pam/CONFIGURE
b/security-libs/linux-pam/CONFIGURE
index 7be2652..2d2a55e 100755
--- a/security-libs/linux-pam/CONFIGURE
+++ b/security-libs/linux-pam/CONFIGURE
@@ -13,5 +13,4 @@ config_query PAM_CHKPWD_SUID
\
$chkpwd_suid_default &&
config_query PAM_SECTTY "Install a default /etc/securetty?" n &&
-config_query PAM_SELINUX "Enable selinux support?" n &&
config_query PAM_DOCS "Build documentation?" n
diff --git a/security-libs/linux-pam/DEPENDS b/security-libs/linux-pam/DEPENDS
index 624982e..dac999b 100755
--- a/security-libs/linux-pam/DEPENDS
+++ b/security-libs/linux-pam/DEPENDS
@@ -4,13 +4,10 @@ depends cracklib &&
depends gnupg &&
depends smgl-fhs &&
-if [ "${PAM_SELINUX}" == "y" ]; then
- depends libselinux
-fi &&
-
if [ "${PAM_DOCS}" == "y" ]; then
depends texlive &&
depends linuxdoc-tools
fi
+optional_depends libselinux "--enable-selinux" "--disable-selinux" "for
selinux support" &&
optional_depends libprelude "--enable-prelude" "--disable-prelude" "for
prelude ids support"
diff --git a/security-libs/linux-pam/HISTORY b/security-libs/linux-pam/HISTORY
index a06b8d7..de5fc5c 100644
--- a/security-libs/linux-pam/HISTORY
+++ b/security-libs/linux-pam/HISTORY
@@ -1,3 +1,9 @@
+2012-07-07 Sukneet Basuta <sukneet AT sourcemage.org>
+ * CONFIGURE: remove config_query for SELINUX
+ * DEPENDS: switch to optional_depends for selinux to pass proper
flags
+ * INSTALL: fix commented out check for libselinux in case
+ someone needs it
+
2011-12-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.1.5, SECURITY_PATCH=3
http://www.redhat.com/archives/pam-list/2011-October/msg00019.html
diff --git a/security-libs/linux-pam/INSTALL b/security-libs/linux-pam/INSTALL
index 05d02bc..131a9f3 100755
--- a/security-libs/linux-pam/INSTALL
+++ b/security-libs/linux-pam/INSTALL
@@ -6,7 +6,7 @@ fi &&
# this is a BUG, the SA should decide if/when selinux is configured
# properly. Activating it before that breaks login, which is BAD.
-#if [ "$PAM_SELINUX" == "y" ]; then
+#if is_depends_enabled $SPELL libselinux; then
# echo "session required pam_selinux.so multiple" >>
/etc/pam.d/login
#fi &&
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index 651eb8e..609eba4 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
SPELL=wireshark
- VERSION=1.6.8
- SECURITY_PATCH=36
+ VERSION=1.8.1
+ SECURITY_PATCH=37
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-
SOURCE_HASH=sha512:1f2eae0b94632f0bc37dbab16afdba711e1b3c8b059390645c38523d114b2c2908ccd0c396fc0c3b89be8b6fb8a314fee7b1e16c57ce05e98bf88d923b55fc78
+
SOURCE_HASH=sha512:fec2212ca6c0b50b84f0642160b4685c5aa9e06677b68fa1103dbbd7dd684bfdc00330b2444a8805169e9fc88866707cf2b0dee45207e7f91ac40f7bcefb6faa
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index 8d7a10a..c676800 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,9 @@
+2012-07-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.1, SECURITY_PATCH=37
+
+2012-06-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.0
+
2012-05-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.8, SECURITY_PATCH=36
diff --git a/shell-term-fm/rdesktop/BUILD b/shell-term-fm/rdesktop/BUILD
index 8d7251a..6ed6a15 100755
--- a/shell-term-fm/rdesktop/BUILD
+++ b/shell-term-fm/rdesktop/BUILD
@@ -1,4 +1,5 @@
OPTS="$RDESKTOP_IPV6 \
+ --without-libvncserver \
$OPTS" &&
if [ "$RDESKTOP_SOUND" != "none" ]; then
diff --git a/shell-term-fm/rdesktop/DEPENDS b/shell-term-fm/rdesktop/DEPENDS
index 1b1b0de..ec5a850 100755
--- a/shell-term-fm/rdesktop/DEPENDS
+++ b/shell-term-fm/rdesktop/DEPENDS
@@ -4,9 +4,10 @@ if list_find $RDESKTOP_SOUND alsa; then
depends alsa-lib
elif list_find $RDESKTOP_SOUND libao; then
depends libao
-fi &&
+fi
-optional_depends libvncserver \
- "--with-libvncserver" \
- "--without-libvncserver" \
- "to build rdp2vnc"
+# current support of this is broken
+#optional_depends libvncserver \
+# "--with-libvncserver" \
+# "--without-libvncserver" \
+# "to build rdp2vnc"
diff --git a/shell-term-fm/rdesktop/HISTORY b/shell-term-fm/rdesktop/HISTORY
index 324e9d4..0c9dc15 100644
--- a/shell-term-fm/rdesktop/HISTORY
+++ b/shell-term-fm/rdesktop/HISTORY
@@ -1,3 +1,6 @@
+2012-07-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS, BUILD: commented libvncserver support, as of broken rdp2vnc
+
2012-06-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: added dependency on libx11
diff --git a/utils/quvi/DEPENDS b/utils/quvi/DEPENDS
index 1c50d1e..e99de10 100755
--- a/utils/quvi/DEPENDS
+++ b/utils/quvi/DEPENDS
@@ -1,3 +1,3 @@
depends curl &&
depends pkgconfig &&
-depends lua
+depends lua51
diff --git a/utils/quvi/HISTORY b/utils/quvi/HISTORY
index f4587dc..ccd60e1 100644
--- a/utils/quvi/HISTORY
+++ b/utils/quvi/HISTORY
@@ -1,3 +1,6 @@
+2012-07-28 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: depends on lua51
+
2011-08-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.2.19
diff --git a/video-libs/libfame/BUILD b/video-libs/libfame/BUILD
new file mode 100755
index 0000000..01c03c5
--- /dev/null
+++ b/video-libs/libfame/BUILD
@@ -0,0 +1,5 @@
+if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 || ${SMGL_COMPAT_ARCHS[1]} == ia32
]]; then
+ OPTS="--enable-sse --enable-mmx $OPTS"
+fi &&
+
+default_build
diff --git a/video-libs/libfame/HISTORY b/video-libs/libfame/HISTORY
index 78da8e6..81850a3 100644
--- a/video-libs/libfame/HISTORY
+++ b/video-libs/libfame/HISTORY
@@ -1,2 +1,8 @@
+2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: added to apply patches and run autoreconf
+ * BUILD: added to pass sse and mmx flags
+ * libfame-0.9.1-fstrict-aliasing.patch,
libfame-0.9.1-underquoted.patch, libfame-0.9.1-x86_64.patch:
+ added, from RPMforge. Fixes build.
+
2007-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, HISTORY: created spell
diff --git a/video-libs/libfame/PRE_BUILD b/video-libs/libfame/PRE_BUILD
new file mode 100755
index 0000000..78a63f9
--- /dev/null
+++ b/video-libs/libfame/PRE_BUILD
@@ -0,0 +1,10 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/libfame-0.9.1-fstrict-aliasing.patch &&
+patch -p1 < $SPELL_DIRECTORY/libfame-0.9.1-underquoted.patch &&
+patch -p1 < $SPELL_DIRECTORY/libfame-0.9.1-x86_64.patch &&
+
+# Needed for autoreconf
+touch NEWS ChangeLog
+autoreconf -f -i
diff --git a/video-libs/libfame/libfame-0.9.1-fstrict-aliasing.patch
b/video-libs/libfame/libfame-0.9.1-fstrict-aliasing.patch
new file mode 100644
index 0000000..f9ddcda
--- /dev/null
+++ b/video-libs/libfame/libfame-0.9.1-fstrict-aliasing.patch
@@ -0,0 +1,32 @@
+diff -Naupr libfame-0.9.1.orig/configure.in libfame-0.9.1/configure.in
+--- libfame-0.9.1.orig/configure.in 2004-02-11 14:12:24.000000000 +0100
++++ libfame-0.9.1/configure.in 2004-10-25 11:49:01.654265064 +0200
+@@ -97,26 +97,9 @@ dnl See if we need to pass -lm for the m
+ AC_CHECK_LIB(m, sqrt, LIBS="$LIBS -lm")
+
+ dnl Optimize
++dnl enable -fstrict-aliasing unconditionally
+ if test x$ac_cv_prog_gcc = xyes; then
+- CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops
-ffast-math"
+-
+-dnl -fstrict-aliasing doesn't seem to be supported by gcc < 2.95
+- gcc_major_version=`$CC --version | \
+- sed -e 's,[[^0-9.]],,g' -e
's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+- gcc_minor_version=`$CC --version | \
+- sed -e 's,[[^0-9.]],,g' -e
's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+- gcc_micro_version=`$CC --version | \
+- sed -e 's,[[^0-9.]],,g' -e
's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-
+- dnl ok, I must admit I don't know how to do or/and ;)
+- if test $gcc_major_version -eq 2; then
+- if test $gcc_minor_version -gt 94; then
+- CFLAGS="$CFLAGS -fstrict-aliasing"
+- fi
+- fi
+- if test $gcc_major_version -gt 2; then
+- CFLAGS="$CFLAGS -fstrict-aliasing"
+- fi
++ CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops
-ffast-math -fstrict-aliasing"
+ fi
+
+ dnl Check for debugging support
diff --git a/video-libs/libfame/libfame-0.9.1-underquoted.patch
b/video-libs/libfame/libfame-0.9.1-underquoted.patch
new file mode 100644
index 0000000..62f0d4b
--- /dev/null
+++ b/video-libs/libfame/libfame-0.9.1-underquoted.patch
@@ -0,0 +1,12 @@
+diff -Naupr libfame-0.9.1.orig/libfame.m4.in libfame-0.9.1/libfame.m4.in
+--- libfame-0.9.1.orig/libfame.m4.in 2001-11-20 12:56:37.000000000 +0100
++++ libfame-0.9.1/libfame.m4.in 2006-09-18 20:38:20.000000000 +0200
+@@ -3,7 +3,7 @@ dnl Test for libfame, and define LIBFAME
+ dnl Vivien Chappelier 12/11/00
+ dnl stolen from ORBit autoconf
+ dnl
+-AC_DEFUN(AM_PATH_LIBFAME,
++AC_DEFUN([AM_PATH_LIBFAME],
+ [dnl
+ dnl Get the cflags and libraries from the libfame-config script
+ dnl
diff --git a/video-libs/libfame/libfame-0.9.1-x86_64.patch
b/video-libs/libfame/libfame-0.9.1-x86_64.patch
new file mode 100644
index 0000000..0abe4be
--- /dev/null
+++ b/video-libs/libfame/libfame-0.9.1-x86_64.patch
@@ -0,0 +1,15 @@
+diff -Naupr libfame-0.9.1.orig/src/fame_malloc.c
libfame-0.9.1/src/fame_malloc.c
+--- libfame-0.9.1.orig/src/fame_malloc.c 2003-06-20 14:40:30.000000000
+0200
++++ libfame-0.9.1/src/fame_malloc.c 2005-09-30 11:08:48.000000000 +0200
+@@ -36,9 +36,9 @@ void* fame_malloc(size_t size)
+ */
+
+ ptr = (unsigned char*) malloc(size+ALIGN);
+- aligned = (unsigned char*) (((unsigned int)ptr & (~(ALIGN-1))) + ALIGN );
++ aligned = (unsigned char*) (((unsigned long)ptr &(~(ALIGN-1))) + ALIGN );
+ padding = aligned - 1;
+- *padding = (ALIGN-1) - ((unsigned int)ptr & (ALIGN-1));
++ *padding = (ALIGN-1) - ((unsigned long)ptr & (ALIGN-1));
+
+ return ((void*)aligned);
+ }
diff --git a/video-libs/xine-lib/DEPENDS b/video-libs/xine-lib/DEPENDS
index 808ad5d..cf58d15 100755
--- a/video-libs/xine-lib/DEPENDS
+++ b/video-libs/xine-lib/DEPENDS
@@ -121,7 +121,7 @@ optional_depends faad2 \
"--disable-faad" \
"for FAAD decoder support" &&
-optional_depends libdts \
+optional_depends libdca \
"--enable-dts" \
"--disable-dts" \
"for DTS decoding library support" &&
diff --git a/video-libs/xine-lib/DETAILS b/video-libs/xine-lib/DETAILS
index c51c6c3..4defb1f 100755
--- a/video-libs/xine-lib/DETAILS
+++ b/video-libs/xine-lib/DETAILS
@@ -1,7 +1,7 @@
SPELL=xine-lib
- VERSION=1.2.1
-
SOURCE_HASH=sha512:7d68bc1ef6a3c15c95218b746437fe7c3ad6fffecab11b39b7580cf1ca0b7e5dda4754f38d459a99d71e82a3b11ac451fefc68fd2f5f3e418fd5136c949c73e4
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=1.2.2
+
SOURCE_HASH=sha512:338916386adafda85bafef0dae862c49470d7b6ccf2d8c83ada7ac2f50d12746daa0ebd3ec3fd68e063e20a1f86b0508665b3a49ba493e7fa9abf22f17bd8b81
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/xine/$SOURCE
WEB_SITE=http://www.xine-project.org/
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index 442ea8a..3e8c565 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,3 +1,9 @@
+2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: replaced libdts with libdca
+
+2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.2; switched source to .xz
+
2012-04-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.2.1
* DEPENDS: corrected dependencies and flags
diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index 3af1f02..d7b1adf 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends yasm \
+optional_depends "X86-ASSEMBLER" \
"" \
"--disable-yasm" \
"for some assembler optimizations" &&
@@ -7,10 +7,6 @@ optional_depends celt \
"--enable-libcelt" \
"" \
"for celt codec support via libcelt" &&
-optional_depends dirac \
- "--enable-libdirac" \
- "" \
- "for dirac encoder support via libdirac" &&
optional_depends frei0r-plugins \
"--enable-frei0r" \
"" \
@@ -29,7 +25,18 @@ optional_depends libass \
optional_depends libmodplug \
"--enable-libmodplug" \
"" \
- "enable libmodplug support for playing mod files"
+ "enable libmodplug support for playing mod files" &&
+optional_depends libvpx \
+ "--enable-libvpx" \
+ "" \
+ "VP8 support"
+
+else
+
+optional_depends dirac \
+ "--enable-libdirac" \
+ "" \
+ "for dirac encoder support via libdirac"
fi &&
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 3fdd3f8..890dd50 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,9 +1,9 @@
SPELL=ffmpeg
if [[ $FFMPEG_RELEASE == stable ]]; then
- VERSION=0.10.3
- SECURITY_PATCH=12
+ VERSION=0.11.1
+ SECURITY_PATCH=13
else
- VERSION=0.7.12
+ VERSION=0.7.13
SECURITY_PATCH=11
fi
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index b761d61..d2cf740 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,15 @@
+2012-06-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated stable to 0.11.1; SECURITY_PATCH++
+
+2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.13 (legacy)
+
+2012-06-04 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated stable to 0.11
+ * DEPENDS: dirac replaced by schroedinger in stable
+ yasm -> X86-assembler (--disable-yasm is still valid)
+ optional_depends libvpx added for stable
+
2012-05-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.10.3
diff --git a/video/mplayer2/BUILD b/video/mplayer2/BUILD
index 4c90659..8574d6b 100755
--- a/video/mplayer2/BUILD
+++ b/video/mplayer2/BUILD
@@ -2,6 +2,12 @@
OPTS="$MPLAYER_OPTS $MPLAYER_IVTV $OPTS" &&
+if [ "$MPLAYER2_BRANCH" == "scm" ]; then
+ local PYVER=$(installed_version python3) &&
+ sed -i "s:python3:python${PYVER%\.*}:" \
+ TOOLS/{file2string,matroska,vdpau_functions}.py
+fi &&
+
CFLAGS= ./configure --prefix=${INSTALL_ROOT}/usr \
--confdir=${TRACK_ROOT}/etc/mplayer \
$OPTS &&
diff --git a/video/mplayer2/DEPENDS b/video/mplayer2/DEPENDS
index c4cf995..c18802f 100755
--- a/video/mplayer2/DEPENDS
+++ b/video/mplayer2/DEPENDS
@@ -50,7 +50,9 @@ fi &&
optional_depends libxv "--enable-xv" "--disable-xv" "for xv output support"
&&
optional_depends xf86-video-mga "--enable-xmga" "--disable-xmga" "for xmga
output support" &&
-if [ "$MPLAYER_SVN" == "y" ]; then
+if [ "$MPLAYER2_BRANCH" == "scm" ]; then
+ depends git &&
+ depends python3 &&
optional_depends libxscrnsaver "" "--disable-xss" "to inhibit screensaver
start while playing"
fi &&
diff --git a/video/mplayer2/HISTORY b/video/mplayer2/HISTORY
index 457812c..a9b74b2 100644
--- a/video/mplayer2/HISTORY
+++ b/video/mplayer2/HISTORY
@@ -1,3 +1,7 @@
+2012-07-20 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD: fixed python3 detection
+ * DEPENDS: corrected scm check, added git and python3 for scm branch
+
2012-05-29 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: git_http -> git in scm branch
* DEPENDS: esound and arts are for stable branch only now
diff --git a/video/transcode/DEPENDS b/video/transcode/DEPENDS
index 9b22e2f..f7c89d1 100755
--- a/video/transcode/DEPENDS
+++ b/video/transcode/DEPENDS
@@ -1,4 +1,4 @@
- auto* for configure hacking
+# auto* for configure hacking
depends autoconf &&
depends automake &&
@@ -22,10 +22,11 @@ optional_depends nasm
\
"" \
"for mpeg encoding with bbmpeg support" &&
-optional_depends avifile \
- "--enable-avifile
--with-avifile-includes=${INSTALL_ROOT}/usr/include/avifile-$(installed_version
avifile | awk -F'.' '{print $1"."$2}')" \
- "--disable-avifile" \
- "for AVI decoding support using avifile" &&
+# unknown to v1.1.7
+#optional_depends avifile \
+# "--enable-avifile
--with-avifile-includes=${INSTALL_ROOT}/usr/include/avifile-$(installed_version
avifile | awk -F'.' '{print $1"."$2}')" \
+# "--disable-avifile" \
+# "for AVI decoding support using avifile" &&
optional_depends a52dec \
"--enable-a52" \
@@ -107,10 +108,12 @@ optional_depends JPEG \
"--disable-libjpeg" \
"for JPEG image support" &&
-optional_depends xvid \
- "--enable-xvid" \
- "--disable-xvid" \
- "for xvid de-/encoding support" &&
+# libvxidcore now incompatible?
+# checking for xvid_global in -lxvidcore... no
+#optional_depends xvid \
+# "--enable-xvid" \
+# "--disable-xvid" \
+# "for xvid de-/encoding support" &&
optional_depends x264 \
'--enable-x264' \
@@ -122,10 +125,11 @@ optional_depends libmpeg2 \
'--disable-libmpeg2' \
'for mpeg2 support' &&
-optional_depends libmpeg3 \
- "--enable-libmpeg3" \
- "--disable-libmpeg3" \
- "for decoding of MPEG files with libmpeg3" &&
+# unknown to 1.1.7
+#optional_depends libmpeg3 \
+# "--enable-libmpeg3" \
+# "--disable-libmpeg3" \
+# "for decoding of MPEG files with libmpeg3" &&
optional_depends mjpegtools \
"--enable-mjpegtools" \
diff --git a/video/transcode/HISTORY b/video/transcode/HISTORY
index 1c0581e..da528ff 100644
--- a/video/transcode/HISTORY
+++ b/video/transcode/HISTORY
@@ -1,3 +1,6 @@
+2012-07-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: hotfix to make it build (disabling xvid)
+
2012-03-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.1.7, SOURCE_URL[0] updated
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 8c007d4..51867b5 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,8 @@
+2012-07-06 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: apply lua 5.2 fixes
+ * lua.patch, lua-scripts.patch: added, applies fixes for lua 5.2
+ from upstream. I assume this will be in the next major update
+
2012-06-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.2, SECURITY_PATCH=24
* PRE_BUILD, glx.patch: patch removed
diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index 02c2ea1..9d792f5 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -1,6 +1,10 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+# lua 5.2 patchs from upstream
+patch -p1 < $SPELL_DIRECTORY/lua.patch &&
+patch -p1 < $SPELL_DIRECTORY/lua-scripts.patch &&
+
MOZ_MAKEFILE="projects/mozilla/Makefile.in" &&
if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
sedit 's:$(libdir)/mozilla:$(libdir)/firefox:' $MOZ_MAKEFILE
diff --git a/video/vlc/lua-scripts.patch b/video/vlc/lua-scripts.patch
new file mode 100644
index 0000000..9bba02c
--- /dev/null
+++ b/video/vlc/lua-scripts.patch
@@ -0,0 +1,131 @@
+From a957114421fd2e875432e5fde0448ffc1ae60cfd Mon Sep 17 00:00:00 2001
+From: Kelly Anderson <kelly AT silka.with-linux.com>
+Date: Thu, 5 Jan 2012 06:23:35 -0700
+Subject: [PATCH 1/1] Cleanup lua script escape sequences for lua 5.2.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Converting \ to %, since 5.2 no longer accepts \.
+
+Signed-off-by: Rémi Denis-Courmont <remi AT remlab.net>
+---
+ share/lua/extensions/imdb.lua | 2 +-
+ share/lua/playlist/appletrailers.lua | 6 +++---
+ share/lua/playlist/extreme.lua | 10 +++++-----
+ share/lua/playlist/katsomo.lua | 2 +-
+ share/lua/playlist/mpora.lua | 4 ++--
+ share/lua/playlist/pinkbike.lua | 4 ++--
+ 6 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/share/lua/playlist/appletrailers.lua
b/share/lua/playlist/appletrailers.lua
+index 8bd4bea..4d0f5e7 100644
+--- a/share/lua/playlist/appletrailers.lua
++++ b/share/lua/playlist/appletrailers.lua
+@@ -67,7 +67,7 @@ function parse()
+ description = find( line, "h%d.->(.-)</h%d") .. ' '
+ end
+ if string.match( line, 'img src=') then
+- for img in string.gmatch(line, '<img src="(http://.*\.jpg)" ')
do
++ for img in string.gmatch(line, '<img src="(http://.*%.jpg)" ')
do
+ art_url = img
+ end
+ for i,value in pairs(playlist) do
+@@ -76,8 +76,8 @@ function parse()
+ else break end
+ end
+ end
+- if string.match( line, "class=\"hd\".-\.mov") then
+- for urlline,resolution in string.gmatch(line,
"class=\"hd\".-href=\"(.-.mov)\".-(%d+.-p)") do
++ if string.match( line, 'class="hd".-%.mov') then
++ for urlline,resolution in string.gmatch(line,
'class="hd".-href="(.-%.mov)".-(%d+.-p)') do
+ urlline = string.gsub( urlline, "_"..resolution,
"_h"..resolution )
+ table.insert( playlist, { path = urlline,
+ name = description .. '(' ..
resolution .. ')',
+diff --git a/share/lua/playlist/extreme.lua b/share/lua/playlist/extreme.lua
+index 6fd7251..f5949ce 100644
+--- a/share/lua/playlist/extreme.lua
++++ b/share/lua/playlist/extreme.lua
+@@ -34,14 +34,14 @@ end
+ -- Probe function.
+ function probe()
+ return vlc.access == "http"
+- and string.match( vlc.path, "extreme.com/." )
+- or string.match( vlc.path, "freecaster.tv/." )
+- or string.match( vlc.path, "player.extreme.com/info/.")
++ and string.match( vlc.path, "extreme%.com/." )
++ or string.match( vlc.path, "freecaster%.tv/." )
++ or string.match( vlc.path, "player%.extreme%.com/info/.")
+ end
+
+ -- Parse function.
+ function parse()
+- if (string.match( vlc.path, "extreme\.com/." ) or string.match(
vlc.path, "freecaster\.tv/." )) and not string.match( vlc.path,
"player.extreme.com/info/") then
++ if (string.match( vlc.path, "extreme%.com/." ) or string.match(
vlc.path, "freecaster%.tv/." )) and not string.match( vlc.path,
"player%.extreme%.com/info/") then
+ while true do
+ line = vlc.readline()
+ if not line then break end
+@@ -54,7 +54,7 @@ function parse()
+ return { { path = "http://player.extreme.com/info/"; .. vid; name =
"extreme.com video"; } }
+ end
+
+- if string.match( vlc.path, "player.extreme.com/info/." ) then
++ if string.match( vlc.path, "player%.extreme%.com/info/." ) then
+ prefres = get_prefres()
+ gostraight = true
+ while true do
+diff --git a/share/lua/playlist/katsomo.lua b/share/lua/playlist/katsomo.lua
+index bf461c7..6965e4e 100644
+--- a/share/lua/playlist/katsomo.lua
++++ b/share/lua/playlist/katsomo.lua
+@@ -57,7 +57,7 @@ function parse()
+ then
+ arturl = "http://www.katsomo.fi"..find( line, " src=\"(.-)\"
alt=" )
+ end
+- for treeid,name in string.gmatch( line,
"/\?treeId=(%d+)\">([^<]+)</a") do
++ for treeid,name in string.gmatch( line,
'/%?treeId=(%d+)">([^<]+)</a') do
+ name = vlc.strings.resolve_xml_special_chars( name )
+ name = vlc.strings.from_charset( "ISO_8859-1", name )
+ path = "http://www.katsomo.fi/?treeId="..treeid
+diff --git a/share/lua/playlist/mpora.lua b/share/lua/playlist/mpora.lua
+index cfee5d0..d48c1e6 100644
+--- a/share/lua/playlist/mpora.lua
++++ b/share/lua/playlist/mpora.lua
+@@ -23,7 +23,7 @@
+ -- Probe function.
+ function probe()
+ return vlc.access == "http"
+- and string.match( vlc.path, "video.mpora.com/watch/" )
++ and string.match( vlc.path, "video%.mpora%.com/watch/" )
+ end
+
+ -- Parse function.
+@@ -40,7 +40,7 @@ function parse()
+ _,_,arturl = string.find( line, "image_src\" href=\"(.*)\" />" )
+ end
+ if string.match( line, "video_src" ) then
+- _,_,video = string.find( line,
"href=\"http://video\.mpora\.com/ep/(.*).swf\" />" )
++ _,_,video = string.find( line,
'href="http://video%.mpora%.com/ep/(.*)%.swf" />' )
+ end
+
+ end
+diff --git a/share/lua/playlist/pinkbike.lua
b/share/lua/playlist/pinkbike.lua
+index 06105d7..f6787c8 100644
+--- a/share/lua/playlist/pinkbike.lua
++++ b/share/lua/playlist/pinkbike.lua
+@@ -45,10 +45,10 @@ function parse()
+ end
+ -- Try to find server which has our video
+ if string.match( line, "<link rel=\"videothumbnail\"
href=\"http://(.*)/vt/svt-") then
+- _,_,server = string.find (line, "<link
rel=\"videothumbnail\"\ href=\"http://(.*)/vt/svt-" )
++ _,_,server = string.find (line, '<link
rel="videothumbnail" href="http://(.*)/vt/svt-' )
+ end
+ if string.match( line, "<link rel=\"videothumbnail\"
href=\"(.*)\" type=\"image/jpeg\"") then
+- _,_,arturl = string.find (line, "<link
rel=\"videothumbnail\" href=\"(.*)\"\ type=\"image/jpeg\"")
++ _,_,arturl = string.find (line, '<link
rel="videothumbnail" href="(.*)" type="image/jpeg"')
+ end
+ end
+
+--
+1.7.10
+
diff --git a/video/vlc/lua.patch b/video/vlc/lua.patch
new file mode 100644
index 0000000..1e76119
--- /dev/null
+++ b/video/vlc/lua.patch
@@ -0,0 +1,411 @@
+From c0f44d25b394418bbbe0f436c67b5872f7f44f5d Mon Sep 17 00:00:00 2001
+From: Kelly Anderson <kelly AT silka.with-linux.com>
+Date: Thu, 5 Jan 2012 06:23:36 -0700
+Subject: [PATCH] Consolidate lua includes in vlc.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+So lua 5.2 compatibility declarations can be made in one place.
+
+Signed-off-by: Rémi Denis-Courmont <remi AT remlab.net>
+---
+ modules/lua/intf.c | 4 ----
+ modules/lua/libs/acl.c | 3 ---
+ modules/lua/libs/configuration.c | 3 ---
+ modules/lua/libs/dialog.c | 3 ---
+ modules/lua/libs/equalizer.c | 3 ---
+ modules/lua/libs/gettext.c | 4 ----
+ modules/lua/libs/httpd.c | 4 ----
+ modules/lua/libs/input.c | 4 +---
+ modules/lua/libs/input.h | 2 ++
+ modules/lua/libs/messages.c | 4 ----
+ modules/lua/libs/misc.c | 4 ----
+ modules/lua/libs/net.c | 3 ---
+ modules/lua/libs/objects.c | 3 ---
+ modules/lua/libs/osd.c | 3 ---
+ modules/lua/libs/playlist.c | 3 ---
+ modules/lua/libs/sd.c | 4 ----
+ modules/lua/libs/stream.c | 3 ---
+ modules/lua/libs/strings.c | 3 ---
+ modules/lua/libs/variables.c | 4 ----
+ modules/lua/libs/video.c | 3 ---
+ modules/lua/libs/vlm.c | 3 ---
+ modules/lua/libs/volume.c | 4 ----
+ modules/lua/libs/xml.c | 3 ---
+ modules/lua/vlc.c | 4 ----
+ modules/lua/vlc.h | 6 ++++++
+ 25 files changed, 9 insertions(+), 78 deletions(-)
+
+diff --git a/modules/lua/intf.c b/modules/lua/intf.c
+index 3b01727..61fe362 100644
+--- a/modules/lua/intf.c
++++ b/modules/lua/intf.c
+@@ -37,10 +37,6 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "vlc.h"
+ #include "libs.h"
+
+diff --git a/modules/lua/libs/acl.c b/modules/lua/libs/acl.c
+index 4deb66e..693137d 100644
+--- a/modules/lua/libs/acl.c
++++ b/modules/lua/libs/acl.c
+@@ -35,9 +35,6 @@
+ #include <vlc_common.h>
+ #include <vlc_acl.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/configuration.c
b/modules/lua/libs/configuration.c
+index 7a4785f..7b5f732 100644
+--- a/modules/lua/libs/configuration.c
++++ b/modules/lua/libs/configuration.c
+@@ -34,9 +34,6 @@
+
+ #include <vlc_common.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/dialog.c b/modules/lua/libs/dialog.c
+index 3ca67b2..55468f3 100644
+--- a/modules/lua/libs/dialog.c
++++ b/modules/lua/libs/dialog.c
+@@ -35,9 +35,6 @@
+ #include <vlc_common.h>
+ #include <vlc_extensions.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/equalizer.c b/modules/lua/libs/equalizer.c
+index 75b2334..e698c6f 100644
+--- a/modules/lua/libs/equalizer.c
++++ b/modules/lua/libs/equalizer.c
+@@ -38,9 +38,6 @@
+ #include <vlc_input.h>
+ #include <vlc_charset.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "input.h"
+ #include "../libs.h"
+ #include "../vlc.h"
+diff --git a/modules/lua/libs/gettext.c b/modules/lua/libs/gettext.c
+index b461e73..2781d35 100644
+--- a/modules/lua/libs/gettext.c
++++ b/modules/lua/libs/gettext.c
+@@ -32,10 +32,6 @@
+ # include "config.h"
+ #endif
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/httpd.c b/modules/lua/libs/httpd.c
+index b4520d9..85a38cc 100644
+--- a/modules/lua/libs/httpd.c
++++ b/modules/lua/libs/httpd.c
+@@ -35,10 +35,6 @@
+ #include <vlc_common.h>
+ #include <vlc_httpd.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/input.c b/modules/lua/libs/input.c
+index 60211fd..7b413e2 100644
+--- a/modules/lua/libs/input.c
++++ b/modules/lua/libs/input.c
+@@ -37,13 +37,11 @@
+
+ #include <vlc_playlist.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+ #include <assert.h>
+
++#include "../vlc.h"
+ #include "input.h"
+ #include "playlist.h"
+-#include "../vlc.h"
+ #include "../libs.h"
+ #include "../extension.h"
+
+diff --git a/modules/lua/libs/input.h b/modules/lua/libs/input.h
+index dbe76df..903134a 100644
+--- a/modules/lua/libs/input.h
++++ b/modules/lua/libs/input.h
+@@ -24,6 +24,8 @@
+ #ifndef VLC_LUA_INPUT_H
+ #define VLC_LUA_INPUT_H
+
++#include "../vlc.h"
++
+ input_thread_t * vlclua_get_input_internal( lua_State * );
+
+ #endif
+diff --git a/modules/lua/libs/messages.c b/modules/lua/libs/messages.c
+index 9c40e53..589d162 100644
+--- a/modules/lua/libs/messages.c
++++ b/modules/lua/libs/messages.c
+@@ -38,10 +38,6 @@
+ #include <vlc_meta.h>
+ #include <vlc_aout.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/misc.c b/modules/lua/libs/misc.c
+index f98d28a..5b793bd 100644
+--- a/modules/lua/libs/misc.c
++++ b/modules/lua/libs/misc.c
+@@ -41,10 +41,6 @@
+ #include <vlc_interface.h>
+ #include <vlc_keys.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/net.c b/modules/lua/libs/net.c
+index 1c7cd12..0e832cc 100644
+--- a/modules/lua/libs/net.c
++++ b/modules/lua/libs/net.c
+@@ -41,9 +41,6 @@
+ #include <vlc_url.h>
+ #include <vlc_fs.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #ifdef HAVE_POLL
+ #include <poll.h> /* poll structures and defines */
+ #endif
+diff --git a/modules/lua/libs/objects.c b/modules/lua/libs/objects.c
+index c3543d6..bcdb43e 100644
+--- a/modules/lua/libs/objects.c
++++ b/modules/lua/libs/objects.c
+@@ -35,9 +35,6 @@
+ #include <vlc_common.h>
+ #include <vlc_vout.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+ #include "objects.h"
+diff --git a/modules/lua/libs/osd.c b/modules/lua/libs/osd.c
+index fb36ed5..e06646b 100644
+--- a/modules/lua/libs/osd.c
++++ b/modules/lua/libs/osd.c
+@@ -35,9 +35,6 @@
+ #include <vlc_vout.h>
+ #include <vlc_osd.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+ #include "input.h"
+diff --git a/modules/lua/libs/playlist.c b/modules/lua/libs/playlist.c
+index ae610f3..2336a37 100644
+--- a/modules/lua/libs/playlist.c
++++ b/modules/lua/libs/playlist.c
+@@ -37,9 +37,6 @@
+ #include <vlc_interface.h>
+ #include <vlc_playlist.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+ #include "playlist.h"
+diff --git a/modules/lua/libs/sd.c b/modules/lua/libs/sd.c
+index 7ca9476..d88cab2 100644
+--- a/modules/lua/libs/sd.c
++++ b/modules/lua/libs/sd.c
+@@ -38,10 +38,6 @@
+ #include <vlc_playlist.h>
+ #include <vlc_charset.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+ #include "playlist.h"
+diff --git a/modules/lua/libs/stream.c b/modules/lua/libs/stream.c
+index ef7187c..6a366f1 100644
+--- a/modules/lua/libs/stream.c
++++ b/modules/lua/libs/stream.c
+@@ -38,9 +38,6 @@
+ #include <vlc_meta.h>
+ #include <vlc_aout.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/strings.c b/modules/lua/libs/strings.c
+index ab8e435..88c5f0e 100644
+--- a/modules/lua/libs/strings.c
++++ b/modules/lua/libs/strings.c
+@@ -39,9 +39,6 @@
+ #include <vlc_aout.h>
+ #include <vlc_charset.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/variables.c b/modules/lua/libs/variables.c
+index f3becae..aad5ae1 100644
+--- a/modules/lua/libs/variables.c
++++ b/modules/lua/libs/variables.c
+@@ -34,10 +34,6 @@
+
+ #include <vlc_common.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+ #include "variables.h"
+diff --git a/modules/lua/libs/video.c b/modules/lua/libs/video.c
+index eb914b5..258e0d2 100644
+--- a/modules/lua/libs/video.c
++++ b/modules/lua/libs/video.c
+@@ -34,9 +34,6 @@
+
+ #include <vlc_vout.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+ #include "input.h"
+diff --git a/modules/lua/libs/vlm.c b/modules/lua/libs/vlm.c
+index d48755c..7b2b708 100644
+--- a/modules/lua/libs/vlm.c
++++ b/modules/lua/libs/vlm.c
+@@ -35,9 +35,6 @@
+ #include <vlc_common.h>
+ #include <vlc_vlm.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/volume.c b/modules/lua/libs/volume.c
+index 3aab542..bae1534 100644
+--- a/modules/lua/libs/volume.c
++++ b/modules/lua/libs/volume.c
+@@ -38,10 +38,6 @@
+ #include <vlc_meta.h>
+ #include <vlc_aout_intf.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+ #include "playlist.h"
+diff --git a/modules/lua/libs/xml.c b/modules/lua/libs/xml.c
+index f8b0afe..80f53fb 100644
+--- a/modules/lua/libs/xml.c
++++ b/modules/lua/libs/xml.c
+@@ -35,9 +35,6 @@
+ #include <vlc_common.h>
+ #include <vlc_xml.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c
+index 5433eb8..a0132cf 100644
+--- a/modules/lua/vlc.c
++++ b/modules/lua/vlc.c
+@@ -45,10 +45,6 @@
+ #include <vlc_stream.h>
+ #include <sys/stat.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "vlc.h"
+
+
/*****************************************************************************
+diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
+index 5d87914..2b8fbff 100644
+--- a/modules/lua/vlc.h
++++ b/modules/lua/vlc.h
+@@ -36,9 +36,15 @@
+ #include <vlc_strings.h>
+ #include <vlc_stream.h>
+
++#define LUA_COMPAT_MODULE
+ #include <lua.h> /* Low level lua C API */
+ #include <lauxlib.h> /* Higher level C API */
+ #include <lualib.h> /* Lua libs */
++#if LUA_VERSION_NUM >= 502
++#define lua_equal(L,idx1,idx2)
lua_compare(L,(idx1),(idx2),LUA_OPEQ)
++#define lua_objlen(L,idx) lua_rawlen(L,idx)
++#define lua_strlen(L,idx) lua_rawlen(L,idx)
++#endif
+
+
/*****************************************************************************
+ * Module entry points
+--
+1.7.10
+
diff --git a/video/xbmc/DEPENDS b/video/xbmc/DEPENDS
index c63800c..6f9d777 100755
--- a/video/xbmc/DEPENDS
+++ b/video/xbmc/DEPENDS
@@ -80,7 +80,7 @@ optional_depends a52dec \
"--enable-external-liba52" \
"--disable-external-liba52" \
"use system liba52" &&
-optional_depends libdts \
+optional_depends libdca \
"--enable-external-libdts" \
"--disable-external-libdts" \
"use system libdts" &&
diff --git a/video/xbmc/HISTORY b/video/xbmc/HISTORY
index 3267a3b..b72d465 100644
--- a/video/xbmc/HISTORY
+++ b/video/xbmc/HISTORY
@@ -1,3 +1,6 @@
+2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: changed optional_depends libdts to libdca
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/wm-addons/xxkb/DEPENDS b/wm-addons/xxkb/DEPENDS
index 6c4c81d..1abe20c 100755
--- a/wm-addons/xxkb/DEPENDS
+++ b/wm-addons/xxkb/DEPENDS
@@ -1,5 +1,6 @@
depends libx11 &&
depends libxpm &&
+depends imake &&
optional_depends librsvg2 \
"-DWITH_SVG_SUPPORT" "" \
diff --git a/wm-addons/xxkb/HISTORY b/wm-addons/xxkb/HISTORY
index 109255d..16c8154 100644
--- a/wm-addons/xxkb/HISTORY
+++ b/wm-addons/xxkb/HISTORY
@@ -1,3 +1,6 @@
+2012-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing imake dependency
+
2011-08-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* INSTALL: install manual page, too
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index 2dcc968..c889f44 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -3,6 +3,7 @@
depends freetype2 '--enable-ft' &&
depends fontconfig &&
depends pixman &&
+depends xz-utils &&
if spell_ok pixman && is_version_less $(installed_version pixman) 0.22.0;
then
force_depends pixman
@@ -18,10 +19,15 @@ optional_depends libxcb \
"--disable-xcb" \
"for XCB surface backend feature" &&
+optional_depends glib2 \
+ "--enable-gobject" \
+ "--disable-gobject" \
+ "for gobject functions feature" &&
+
optional_depends libx11 \
- "--enable-xlib" \
- "--disable-xlib" \
- "for Xlib surface backend feature" &&
+ "--enable-xlib" \
+ "--disable-xlib" \
+ "for Xlib surface backend feature" &&
if is_depends_enabled $SPELL libx11; then
optional_depends libxrender \
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 6bd4a33..f293030 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,11 @@
+2012-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * SUB_DEPENDS: corrected XCB comment, added GOBJ subdep
+ * {REPAIR^all^,}PRE_SUB_DEPENDS: added GOBJ subdep
+ * DEPENDS: added glib2 optional dep; fixed aligning for libx11
+
+2012-05-13 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: added xz-utils, it's not part of basesystem...
+
2012-05-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.12.2
diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index fd530b1..15cc31b 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -2,6 +2,7 @@ case $THIS_SUB_DEPENDS in
CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
XCB) is_depends_enabled $SPELL libxcb;;
+ GOBJ) is_depends_enabled $SPELL glib2;;
PNG) is_depends_enabled $SPELL libpng;;
PS) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-ps.h" ]];;
SVG) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-svg.h" ]];;
diff --git a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
index fd530b1..15cc31b 100755
--- a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
@@ -2,6 +2,7 @@ case $THIS_SUB_DEPENDS in
CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
XCB) is_depends_enabled $SPELL libxcb;;
+ GOBJ) is_depends_enabled $SPELL glib2;;
PNG) is_depends_enabled $SPELL libpng;;
PS) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-ps.h" ]];;
SVG) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-svg.h" ]];;
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index 3286867..1a1e7d7 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -2,8 +2,10 @@ case $THIS_SUB_DEPENDS in
CAIRO_DEVEL) echo "Devel release needed, forcing it." &&
CAIRO_DEVEL="y" ;;
PDF) return 0;;
- XCB) message "Cairo with XCB support requested, forcing xcb-util
dependency" &&
+ XCB) message "Cairo with XCB support requested, forcing libxcb dependency"
&&
depends libxcb "--enable-xcb";;
+ GOBJ) message "Cairo with gobject functions feature requested, forcing
glib2 dependency" &&
+ depends glib2 "--enable-gobject";;
PNG) message "Cairo with PNG support requested, forcing libpng dependency"
&&
depends libpng "--enable-png --enable-svg";;
PS) return 0;;
diff --git a/x11-toolkits/gtk+3/DEPENDS b/x11-toolkits/gtk+3/DEPENDS
index 76ce35e..edce7d3 100755
--- a/x11-toolkits/gtk+3/DEPENDS
+++ b/x11-toolkits/gtk+3/DEPENDS
@@ -2,14 +2,14 @@
if [[ "$GTK_VER" == "devel" ]]; then
depends -sub GLIB_DEVEL glib2 &&
- depends -sub "CAIRO_DEVEL PDF PS SVG X" cairo &&
+ depends -sub "CAIRO_DEVEL PDF PS SVG X GOBJ" cairo &&
optional_depends -sub GOBJ_DEVEL gobject-introspection \
"--enable-introspection=yes" \
"--enable-introspection=no" \
"to enable introspection support"
else
depends glib2 &&
- depends -sub "PDF PS SVG X" cairo &&
+ depends -sub "PDF PS SVG X GOBJ" cairo &&
optional_depends gobject-introspection \
"--enable-introspection=yes" \
"--enable-introspection=no" \
diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index e74c4f9..522f16d 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,3 +1,6 @@
+2012-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: strictly requires cairo with glib2 dep enabled
+
2012-05-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.4.2
diff --git a/x11-toolkits/gtk-sharp-2/DETAILS
b/x11-toolkits/gtk-sharp-2/DETAILS
index 7e785f6..bf4c228 100755
--- a/x11-toolkits/gtk-sharp-2/DETAILS
+++ b/x11-toolkits/gtk-sharp-2/DETAILS
@@ -1,11 +1,9 @@
SPELL=gtk-sharp-2
- VERSION=2.12.10
- BRANCH=`echo $VERSION|cut -d . -f 1,2`
+ VERSION=2.12.11
SOURCE=gtk-sharp-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/gtk-sharp-${VERSION}
- SOURCE_URL[0]=${GNOME_URL}/sources/gtk-sharp/${BRANCH}/$SOURCE
-# SOURCE_URL[1]=http://ftp.novell.com/pub/mono/sources/gtk-sharp212/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_URL[0]=http://download.mono-project.com/sources/gtk-sharp212/$SOURCE
+
SOURCE_HASH=sha512:870ddc559bcac3071f13ddb9e04a02022e2eea5f7a8335b574a747b726c0e5ecd005847f726069c555b64a289d625071f4b319c1b1242d6d1c05e62a46b7db88
WEB_SITE=http://www.mono-project.com/
LICENSE[0]=LGPL
ENTERED=20050611
diff --git a/x11-toolkits/gtk-sharp-2/HISTORY
b/x11-toolkits/gtk-sharp-2/HISTORY
index c53f694..8a0b7a9 100644
--- a/x11-toolkits/gtk-sharp-2/HISTORY
+++ b/x11-toolkits/gtk-sharp-2/HISTORY
@@ -1,3 +1,10 @@
+2012-07-10 Tommy Boatman <tboatman AT sourcemage.org>
+ * DETAILS: 2.12.11, changed SOURCE_URL to reflect new home
+ at mono-project
+ * glib_fix.patch: created to address build failure with newer
+ versions of glib2 (bug #407)
+ * PRE_BUILD: patch application before libtoolize
+
2010-03-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: commented out SOURCE_URL[1], same content but different
size
* gtk-sharp-2.12.10.tar.bz2.sig: updated to SOURCE_URL[0] tarball
diff --git a/x11-toolkits/gtk-sharp-2/PRE_BUILD
b/x11-toolkits/gtk-sharp-2/PRE_BUILD
index ac2a160..266664a 100755
--- a/x11-toolkits/gtk-sharp-2/PRE_BUILD
+++ b/x11-toolkits/gtk-sharp-2/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
touch INSTALL &&
+patch -p1 < $SCRIPT_DIRECTORY/glib_fix.patch &&
libtoolize -f &&
autoreconf -f
diff --git a/x11-toolkits/gtk-sharp-2/glib_fix.patch
b/x11-toolkits/gtk-sharp-2/glib_fix.patch
new file mode 100644
index 0000000..5825f27
--- /dev/null
+++ b/x11-toolkits/gtk-sharp-2/glib_fix.patch
@@ -0,0 +1,117 @@
+diff -urN old/configure.in new/configure.in
+--- old/configure.in 2012-07-08 14:43:54.333939345 -0500
++++ new/configure.in 2012-07-08 14:39:06.505947046 -0500
+@@ -223,6 +223,16 @@
+ AM_CONDITIONAL(ENABLE_MSI, test "x$enable_msi" = "xyes")
+ AM_CONDITIONAL(ENABLE_MONOGETOPTIONS, test "x$has_mono" = "xtrue")
+
++PKG_CHECK_MODULES(GLIB_2_31,
++ glib-2.0 >= 2.31,
++ HAVE_GLIB_2_31_OR_HIGHER=yes, HAVE_GLIB_2_31_OR_HIGHER=no)
++
++if test "x$HAVE_GLIB_2_31_OR_HIGHER" = "xyes" ; then
++ CFLAGS="$CFLAGS -DDISABLE_GTHREAD_CHECK"
++ CSFLAGS="$CSFLAGS -define:DISABLE_GTHREAD_CHECK"
++fi
++
++AC_SUBST(CSFLAGS)
+ AC_SUBST(CFLAGS)
+
+ AC_OUTPUT([
+diff -urN old/glib/Thread.cs new/glib/Thread.cs
+--- old/glib/Thread.cs 2012-07-08 14:44:51.373937819 -0500
++++ new/glib/Thread.cs 2012-07-08 14:46:02.825935908 -0500
+@@ -21,29 +21,42 @@
+
+ namespace GLib
+ {
+- using System;
+- using System.Runtime.InteropServices;
++ using System;
++ using System.Runtime.InteropServices;
+
+- public class Thread
+- {
+- private Thread () {}
+-
+- [DllImport("libgthread-2.0-0.dll")]
+- static extern void g_thread_init (IntPtr i);
+-
+- public static void Init ()
+- {
+- g_thread_init (IntPtr.Zero);
+- }
+-
+- [DllImport("glibsharpglue-2")]
+- static extern bool glibsharp_g_thread_supported ();
+-
+- public static bool Supported
+- {
+- get {
+- return glibsharp_g_thread_supported ();
+- }
+- }
+- }
+-}
++ public class Thread
++ {
++ private Thread () {}
++
++#if DISABLE_GTHREAD_CHECK
++ public static void Init ()
++ {
++ // GLib automatically inits threads in 2.31 and above
++ //
http://developer.gnome.org/glib/unstable/glib-Deprecated-Thread-APIs.html#g-thread-init
++ }
++
++ public static bool Supported {
++ get { return true; }
++ }
++#else
++ [DllImport("libgthread-2.0-0.dll")]
++ static extern void g_thread_init (IntPtr i);
++
++ public static void Init ()
++ {
++ g_thread_init (IntPtr.Zero);
++ }
++
++ [DllImport("glibsharpglue-2")]
++ static extern bool glibsharp_g_thread_supported ();
++
++ public static bool Supported
++ {
++ get {
++ return glibsharp_g_thread_supported ();
++ }
++ }
++#endif
++
++ }
++}
+\ No newline at end of file
+diff -urN old/glib/glue/thread.c new/glib/glue/thread.c
+--- old/glib/glue/thread.c 2012-07-07 18:38:18.693593075 -0500
++++ new/glib/glue/thread.c 2012-07-07 20:19:22.973430852 -0500
+@@ -19,14 +19,21 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-
++#ifdef DISABLE_GTHREAD_CHECK
++#include <glib.h>
++#else
+ #include <glib/gthread.h>
++#endif
+
+ gboolean glibsharp_g_thread_supported (void);
+
+ gboolean
+ glibsharp_g_thread_supported ()
+ {
++#ifdef DISABLE_GTHREAD_CHECK
++ return TRUE;
++#else
+ return g_thread_supported ();
++#endif
+ }
diff --git a/x11-toolkits/gtk-sharp-2/gtk-sharp-2.12.10.tar.bz2.sig
b/x11-toolkits/gtk-sharp-2/gtk-sharp-2.12.10.tar.bz2.sig
deleted file mode 100644
index cd3c880..0000000
Binary files a/x11-toolkits/gtk-sharp-2/gtk-sharp-2.12.10.tar.bz2.sig and
/dev/null differ
diff --git a/x11/easystroke/HISTORY b/x11/easystroke/HISTORY
index c97f72d..df2de8e 100644
--- a/x11/easystroke/HISTORY
+++ b/x11/easystroke/HISTORY
@@ -1,3 +1,6 @@
+2012-07-23 Sukneet Basuta <sukneet AT sourcemage.org>
+ * TRIGGERS: added, to check_self when boost is cast
+
2011-11-05 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 0.5.5.1
converted to guru signed spell
diff --git a/x11/easystroke/TRIGGERS b/x11/easystroke/TRIGGERS
new file mode 100755
index 0000000..1696e74
--- /dev/null
+++ b/x11/easystroke/TRIGGERS
@@ -0,0 +1 @@
+on_cast boost check_self
diff --git a/x11/gtk-chtheme/HISTORY b/x11/gtk-chtheme/HISTORY
index b0be2b9..a430b4f 100644
--- a/x11/gtk-chtheme/HISTORY
+++ b/x11/gtk-chtheme/HISTORY
@@ -1,3 +1,7 @@
+2012-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply the patch
+ * gtk224.patch: added, to fix build with gtk+2 >= 2.24
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/x11/gtk-chtheme/PRE_BUILD b/x11/gtk-chtheme/PRE_BUILD
new file mode 100755
index 0000000..65fca46
--- /dev/null
+++ b/x11/gtk-chtheme/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/gtk224.patch"
diff --git a/x11/gtk-chtheme/gtk224.patch b/x11/gtk-chtheme/gtk224.patch
new file mode 100644
index 0000000..4fad5b4
--- /dev/null
+++ b/x11/gtk-chtheme/gtk224.patch
@@ -0,0 +1,22 @@
+--- util.c.orig 2004-02-08 17:42:33.000000000 +0400
++++ util.c 2012-07-24 19:32:31.725182191 +0400
+@@ -19,7 +19,7 @@
+
+ GtkWidget* unfocussable(GtkWidget *w)
+ {
+- GTK_WIDGET_UNSET_FLAGS(w, GTK_CAN_FOCUS);
++ gtk_widget_set_can_focus(w, TRUE);
+ return w;
+ }
+
+--- theme_sel.c.orig 2004-02-09 06:20:28.000000000 +0400
++++ theme_sel.c 2012-07-24 19:37:24.000000000 +0400
+@@ -110,7 +110,7 @@
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_container_add(GTK_CONTAINER(sw), theme_list);
+
+- gtk_timeout_add(0, (GtkFunction)theme_list_focus, theme_list);
++ gtk_timeout_add(0, (GSourceFunc)theme_list_focus, theme_list);
+
+ return sw;
+ }
diff --git a/x11/x11vnc/DEPENDS b/x11/x11vnc/DEPENDS
index e1f9cb4..2b7884c 100755
--- a/x11/x11vnc/DEPENDS
+++ b/x11/x11vnc/DEPENDS
@@ -1,3 +1,4 @@
+depends libxtst &&
depends xorg-server &&
optional_depends libvncserver \
diff --git a/x11/x11vnc/HISTORY b/x11/x11vnc/HISTORY
index 8603f91..f00bf53 100644
--- a/x11/x11vnc/HISTORY
+++ b/x11/x11vnc/HISTORY
@@ -1,3 +1,7 @@
+2012-07-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added not strictly required, but highly recommended libxtst
+ dependency
+
2011-09-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.9.13
diff --git a/xfce/xfburn/HISTORY b/xfce/xfburn/HISTORY
index 37f7e4c..e1f6e70 100644
--- a/xfce/xfburn/HISTORY
+++ b/xfce/xfburn/HISTORY
@@ -1,3 +1,10 @@
+2012-07-26 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD: apply glib232.patch to stable branch only
+
+2012-07-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added to apply the patch
+ * glib232.patch: added, to fix build with recent glib2
+
2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
diff --git a/xfce/xfburn/PRE_BUILD b/xfce/xfburn/PRE_BUILD
new file mode 100755
index 0000000..595d651
--- /dev/null
+++ b/xfce/xfburn/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if [[ $XFBURN_BRANCH != scm ]]; then
+ patch -p0 < "$SPELL_DIRECTORY/glib232.patch"
+fi
diff --git a/xfce/xfburn/glib232.patch b/xfce/xfburn/glib232.patch
new file mode 100644
index 0000000..9e3951b
--- /dev/null
+++ b/xfce/xfburn/glib232.patch
@@ -0,0 +1,10 @@
+--- xfburn/xfburn-settings.h.orig 2009-10-25 01:18:10.000000000 +0400
++++ xfburn/xfburn-settings.h 2012-07-26 11:11:42.806567198 +0400
+@@ -24,6 +24,7 @@
+ #endif /* !HAVE_CONFIG_H */
+
+ #include <glib.h>
++#include <glib-object.h>
+
+ G_BEGIN_DECLS
+
- [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (63f3653a1f50520be135ebef70b91affe2524ada), Vlad Glagolev, 07/29/2012
Archive powered by MHonArc 2.6.24.