From 0d7bab226067a44a9f1b978924e8201a3fa60764 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 24 Oct 2011 23:14:47 +0000 Subject: Mon Oct 24 23:14:47 UTC 2011 --- extra/dnsmasq/PKGBUILD | 4 +- extra/exo/PKGBUILD | 5 +- extra/exo/exo.install | 1 - extra/kdeplasma-applets-networkmanagement/PKGBUILD | 10 +-- extra/kino/PKGBUILD | 7 +- extra/live-media/PKGBUILD | 6 +- extra/mpd/PKGBUILD | 28 ++++--- extra/oprofile/PKGBUILD | 6 +- extra/transmission/PKGBUILD | 12 +-- extra/watchdog/PKGBUILD | 27 ++++--- .../watchdog/watchdog-5.9-use-oom_score_adj.patch | 91 ++++++++++++++++++++++ extra/whois/PKGBUILD | 6 +- extra/xfburn/PKGBUILD | 14 +++- extra/xfburn/fix_empty_dir_segfault.diff | 48 ++++++++++++ 14 files changed, 209 insertions(+), 56 deletions(-) create mode 100644 extra/watchdog/watchdog-5.9-use-oom_score_adj.patch create mode 100644 extra/xfburn/fix_empty_dir_segfault.diff (limited to 'extra') diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index 65e802c7f..6751d8023 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140810 2011-10-19 16:21:22Z dreisner $ +# $Id: PKGBUILD 141089 2011-10-23 16:20:24Z dreisner $ # Maintainer: Dave Reisner # Contributor: Paul Mattal # Contributor: Tom Newsom @@ -19,7 +19,7 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" 'dnsmasq.confd' 'rc.dnsmasq' 'dnsmasq.service') -md5sums=('29d43f182ecad06d64b3598c02380a80' +md5sums=('b5757ef2d7b651748eeebb88af29d7d6' '66479e99123faeab83ebaed709ef95b5' '9f180cc236808bbd02ca8652fd2e8217' 'f329d86f8ba1cd85f9b6ee59e0ce3791') diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD index daf711480..ebfbeed84 100644 --- a/extra/exo/PKGBUILD +++ b/extra/exo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 127211 2011-06-11 09:02:27Z andyrtr $ +# $Id: PKGBUILD 141087 2011-10-23 16:12:32Z andyrtr $ # Maintainer: AndyRTR # Contributor: tobias # Contributor: Aurelien Foret pkgname=exo pkgver=0.6.2 -pkgrel=1 +pkgrel=3 pkgdesc="Extensions to Xfce by os-cillation" arch=('i686' 'x86_64') license=('GPL2' 'LGPL') @@ -28,7 +28,6 @@ build() { --libexecdir=/usr/lib/xfce4 \ --localstatedir=/var \ --disable-static \ - --enable-gio-unix \ --enable-python \ --enable-gtk-doc \ --disable-debug diff --git a/extra/exo/exo.install b/extra/exo/exo.install index 3525fa4a2..17ca8f78a 100644 --- a/extra/exo/exo.install +++ b/extra/exo/exo.install @@ -1,6 +1,5 @@ post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - usr/bin/gio-querymodules usr/lib/gio/modules } post_upgrade() { diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index 726af5db2..f206dd06c 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -4,8 +4,8 @@ pkgname=kdeplasma-applets-networkmanagement epoch=1 -pkgver=0.9.0beta1 -_commit=90c59c37c68920a44860ff5b8f7bcc146850efcf +pkgver=0.9.0beta2 +_pkgver=0.8.90 pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64') @@ -17,14 +17,14 @@ makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info' optdepends=('mobile-broadband-provider-info: Database of mobile broadband service providers' 'openconnect: Cisco AnyConnect compatible VPN client') install=${pkgname}.install -source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}") -md5sums=('d6100be03b9114bffc079ef4b690a33e') +source=("ftp://ftp.kde.org/pub/kde/unstable/networkmanagement/${_pkgver}/src/networkmanagement-${_pkgver}.tar.bz2") +sha1sums=('9336049eb00f5e4fe7434e710eeb0bdfc22e0984') build() { cd "${srcdir}" mkdir build cd build - cmake ../networkmanagement \ + cmake ../networkmanagement-${_pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/kino/PKGBUILD b/extra/kino/PKGBUILD index f283fe014..2a9681e31 100644 --- a/extra/kino/PKGBUILD +++ b/extra/kino/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 141051 2011-10-22 15:12:07Z andrea $ +# $Id: PKGBUILD 141101 2011-10-23 23:38:04Z andrea $ # Maintainer: Giovanni Scafora # Contributor: Robert Emil Berge pkgname=kino pkgver=1.3.4 -pkgrel=3 +pkgrel=4 pkgdesc="A non-linear DV editor" arch=('i686' 'x86_64') url="http://www.kinodv.org/" @@ -31,4 +31,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + + # Fix permissions + chown -R root:root "${pkgdir}/usr/share/kino/help" } diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 68b959a6d..4f866ff26 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138700 2011-09-27 16:47:11Z giovanni $ +# $Id: PKGBUILD 141079 2011-10-23 13:48:14Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Gilles CHAUVIN pkgname=live-media -pkgver=2011.09.19 +pkgver=2011.10.18 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('7834800179503377d7142b4bfbbf0dca') +md5sums=('fefff83a134a5561395b11057ad2fc09') build() { cd ${srcdir}/live diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index fcfe8d4a2..a2aced8ca 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136986 2011-09-04 17:03:38Z angvp $ +# $Id: PKGBUILD 141091 2011-10-23 16:35:52Z dreisner $ # Maintainer: Angel Velasquez # Contributor: Andrea Scarpino # Contributor: Damir Perisa # Contributor: Ben pkgname=mpd -pkgver=0.16.4 +pkgver=0.16.5 pkgrel=1 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" arch=('i686' 'x86_64') @@ -17,13 +17,14 @@ depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'f makedepends=('pkgconfig' 'doxygen') install=${pkgname}.install changelog=ChangeLog -source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" +source=("http://downloads.sourceforge.net/musicpd/$pkgname-$pkgver.tar.bz2" 'mpd') -md5sums=('ddac46eb7d976c5cc6f9bac9e4e100f1' +md5sums=('f7564cff12035f6a1112cce770655df7' 'e5669c2bff4031928531e52475addeb1') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ --sysconfdir=/etc \ --enable-lastfm \ @@ -32,15 +33,18 @@ build() { --enable-documentation \ --disable-libwrap \ --disable-cue \ - --disable-sidplay + --disable-sidplay \ + --with-systemdsystemunitdir=/lib/systemd/system + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install - # set ours dirs in mpd.conf file + # set our dirs in mpd.conf file sed -i 's|^music_directory.*$|#music_directory "path_to_your_music_collection"|1' doc/mpdconf.example sed -i 's|playlist_directory.*$|playlist_directory "/var/lib/mpd/playlists"|1' doc/mpdconf.example sed -i 's|db_file.*$|db_file "/var/lib/mpd/mpd.db"|1' doc/mpdconf.example @@ -50,8 +54,8 @@ package() { sed -i 's|#state_file.*$|state_file "/var/lib/mpd/mpdstate"|1' doc/mpdconf.example sed -i 's|#user.*$|user "mpd"|1' doc/mpdconf.example - install -Dm644 doc/mpdconf.example ${pkgdir}/usr/share/mpd/mpd.conf.example + install -Dm644 "doc/mpdconf.example" "$pkgdir/usr/share/mpd/mpd.conf.example" - install -Dm755 ${srcdir}/mpd ${pkgdir}/etc/rc.d/mpd - install -d ${pkgdir}/var/{lib/mpd/playlists,log/mpd} + install -Dm755 "$srcdir/mpd" "$pkgdir/etc/rc.d/mpd" + install -d "$pkgdir"/var/{lib/mpd/playlists,log/mpd} } diff --git a/extra/oprofile/PKGBUILD b/extra/oprofile/PKGBUILD index b557d828e..2bc5449c2 100644 --- a/extra/oprofile/PKGBUILD +++ b/extra/oprofile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137218 2011-09-06 19:49:42Z eric $ +# $Id: PKGBUILD 141099 2011-10-23 23:25:40Z eric $ # Maintainer : Aaron Griffin pkgname=oprofile pkgver=0.9.7 -pkgrel=2 +pkgrel=3 pkgdesc="A system-wide profiler for Linux systems, capable of profiling all running code at low overhead" arch=('i686' 'x86_64') url="http://oprofile.sourceforge.net" @@ -29,7 +29,7 @@ package() { install -d "$pkgdir/var/lib/oprofile" # installing development libraries - FS#20089 - install -m644 libutil/op_types.h libop/op_sample_file.h libutil/op_list.h libop/op_events.h libop/op_cpu_type.h libop/op_config.h libdb/odb.h "$pkgdir/usr/include" + install -m644 libop/op_*.h libregex/op_*.h libutil/op_*.h libutil++/op_*.h libdb/odb.h "$pkgdir/usr/include" install -m644 libop/libop.a libdb/libodb.a "$pkgdir/usr/lib/" install -m644 libabi/libabi.a "$pkgdir/usr/lib/libopabi.a" install -m644 libutil/libutil.a "$pkgdir/usr/lib/liboputil.a" diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index 01fe7bbcd..68d081cd4 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 140241 2011-10-10 15:24:45Z ibiru $ +# $Id: PKGBUILD 141093 2011-10-23 18:45:30Z ibiru $ # Maintainer : Ionut Biru pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.41 -pkgrel=2 +pkgver=2.42 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.transmissionbt.com/" license=('MIT') -makedepends=('gtk2' 'intltool' 'curl' 'qt' 'libevent') +makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent') source=(http://mirrors.m0k.org/transmission/files/${pkgbase}-${pkgver}.tar.xz transmissiond transmissiond.conf) -md5sums=('0d0a061dfb92c0cb359dc531d5da0a94' +md5sums=('50f6dd76c5c01f45d5ed20783c686815' '08875299e3fbb68fc546c1f350ac1f06' 'be39806c35b7544856fa4070b00fc960') build() { @@ -43,7 +43,7 @@ package_transmission-cli() { package_transmission-gtk() { pkgdesc="Fast, easy, and free BitTorrent client (GTK+ GUI)" - depends=('curl' 'libevent' 'gtk2' 'desktop-file-utils' 'hicolor-icon-theme') + depends=('curl' 'libevent' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('notification-daemon: Desktop notification support' 'transmission-cli: daemon and web support') install=transmission-gtk.install diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD index 70ec8a57b..cb4c36d88 100644 --- a/extra/watchdog/PKGBUILD +++ b/extra/watchdog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 111485 2011-02-27 10:22:27Z thomas $ +# $Id: PKGBUILD 141081 2011-10-23 14:16:24Z thomas $ # Maintainer: Thomas Bächler pkgname=watchdog pkgver=5.9 -pkgrel=1 +pkgrel=2 pkgdesc="Watchdog daemon" arch=(i686 x86_64) url="http://sourceforge.net/projects/watchdog" @@ -14,14 +14,17 @@ backup=(etc/watchdog.conf etc/conf.d/wd_keepalive) source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz watchdog.sh - watchdog.cf) + watchdog.cf + watchdog-5.9-use-oom_score_adj.patch) md5sums=('d7cae3c9829f5d9a680764f314234867' '854451f554718b55186599faaa8d85f6' - '01c1e2e13f515131180b4ebe9b8b7cc3') + '01c1e2e13f515131180b4ebe9b8b7cc3' + '9a1ab454e42a7f2969ef6bf2da8a4543') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/watchdog-5.9-use-oom_score_adj.patch ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ @@ -31,14 +34,14 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make install DESTDIR=${pkgdir} + cd "${srcdir}"/${pkgname}-${pkgver} + make install DESTDIR="${pkgdir}" for fil in watchdog wd_keepalive ; do - install -D -m755 ${srcdir}/watchdog.sh ${pkgdir}/etc/rc.d/${fil} - install -D -m644 ${srcdir}/watchdog.cf ${pkgdir}/etc/conf.d/${fil} + install -D -m755 "${srcdir}"/watchdog.sh "${pkgdir}"/etc/rc.d/${fil} + install -D -m644 "${srcdir}"/watchdog.cf "${pkgdir}"/etc/conf.d/${fil} done - sed -i 's/watchdog/wd_keepalive/g' ${pkgdir}/etc/rc.d/wd_keepalive - sed -i 's/watchdog/wd_keepalive/g' ${pkgdir}/etc/conf.d/wd_keepalive - sed -i 's/Watchdog/Simple Watchdog/' ${pkgdir}/etc/rc.d/wd_keepalive + sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/rc.d/wd_keepalive + sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/conf.d/wd_keepalive + sed -i 's/Watchdog/Simple Watchdog/' "${pkgdir}"/etc/rc.d/wd_keepalive } diff --git a/extra/watchdog/watchdog-5.9-use-oom_score_adj.patch b/extra/watchdog/watchdog-5.9-use-oom_score_adj.patch new file mode 100644 index 000000000..90508d777 --- /dev/null +++ b/extra/watchdog/watchdog-5.9-use-oom_score_adj.patch @@ -0,0 +1,91 @@ +diff -ur watchdog-5.9.orig/src/watchdog.c watchdog-5.9/src/watchdog.c +--- watchdog-5.9.orig/src/watchdog.c 2010-06-16 15:45:51.000000000 +0200 ++++ watchdog-5.9/src/watchdog.c 2011-10-23 15:51:58.631689778 +0200 +@@ -636,7 +636,7 @@ + + /* allocate some memory to store a filename, this is needed later on even + * if the system runs out of memory */ +- filename_buf = (char*)malloc(max(strlen(logdir) + sizeof("/repair-bin.stdout") + 1, strlen("/proc//oom_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1)); ++ filename_buf = (char*)malloc(max(strlen(logdir) + sizeof("/repair-bin.stdout") + 1, strlen("/proc//oom_score_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1)); + if (!filename_buf) { + error(progname); + exit(1); +@@ -886,11 +886,19 @@ + #endif + + /* tell oom killer to not kill this process */ +- sprintf(filename_buf, "/proc/%d/oom_adj", pid); ++ sprintf(filename_buf, "/proc/%d/oom_score_adj", pid); + fp = fopen(filename_buf, "w"); + if (fp != NULL) { +- fprintf(fp, "-17\n"); +- (void) fclose(fp); ++ fprintf(fp, "-1000\n"); ++ (void) fclose(fp); ++ } ++ else { ++ sprintf(filename_buf, "/proc/%d/oom_adj", pid); ++ fp = fopen(filename_buf, "w"); ++ if (fp != NULL) { ++ fprintf(fp, "-17\n"); ++ (void) fclose(fp); ++ } + } + + /* main loop: update after seconds */ +diff -ur watchdog-5.9.orig/src/wd_keepalive.c watchdog-5.9/src/wd_keepalive.c +--- watchdog-5.9.orig/src/wd_keepalive.c 2010-06-16 15:45:49.000000000 +0200 ++++ watchdog-5.9/src/wd_keepalive.c 2011-10-23 15:50:43.061563281 +0200 +@@ -212,7 +212,7 @@ + FILE *fp; + char *configfile = CONFIG_FILENAME; + char *filename_buf; +- pid_t child_pid; ++ pid_t pid, child_pid; + int count = 0; + int c; + /* allow all options watchdog understands too */ +@@ -284,7 +284,7 @@ + + /* allocate some memory to store a filename, this is needed later on even + * if the system runs out of memory */ +- filename_buf = (char*)malloc(strlen("/proc//oom_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1); ++ filename_buf = (char*)malloc(strlen("/proc//oom_score_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1); + if (!filename_buf) { + error(progname); + exit(1); +@@ -363,9 +363,10 @@ + #endif + + /* tuck my process id away */ ++ pid = getpid(); + fp = fopen(KA_PIDFILE, "w"); + if ( fp != NULL ) { +- fprintf(fp, "%d\n", getpid()); ++ fprintf(fp, "%d\n", pid); + (void) fclose(fp); + } + +@@ -403,12 +404,20 @@ + #endif + + /* tell oom killer to not kill this process */ +- sprintf(filename_buf, "/proc/%d/oom_adj", getpid()); ++ sprintf(filename_buf, "/proc/%d/oom_score_adj", pid); + fp = fopen(filename_buf, "w"); + if (fp != NULL) { +- fprintf(fp, "-17\n"); ++ fprintf(fp, "-1000\n"); + (void) fclose(fp); + } ++ else { ++ sprintf(filename_buf, "/proc/%d/oom_adj", pid); ++ fp = fopen(filename_buf, "w"); ++ if (fp != NULL) { ++ fprintf(fp, "-17\n"); ++ (void) fclose(fp); ++ } ++ } + + /* main loop: update after seconds */ + while ( _running ) { diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD index 99e4b2a91..fcbf0fc9f 100644 --- a/extra/whois/PKGBUILD +++ b/extra/whois/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108896 2011-02-04 18:32:02Z giovanni $ +# $Id: PKGBUILD 141085 2011-10-23 14:30:06Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Tom Newsom pkgname=whois -pkgver=5.0.11 +pkgver=5.0.12 pkgrel=1 pkgdesc="The whois client by Marco d'Itri" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('libidn') makedepends=('perl') source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.gz") -md5sums=('942e2d90b0bcd7d22765c8e3344fe118') +md5sums=('1147b6a993af384ba341cb91666c7e97') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xfburn/PKGBUILD b/extra/xfburn/PKGBUILD index 131dc466a..7ff0c7cf1 100755 --- a/extra/xfburn/PKGBUILD +++ b/extra/xfburn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119475 2011-04-11 17:44:33Z andyrtr $ +# $Id: PKGBUILD 141077 2011-10-23 09:32:55Z andyrtr $ # Maintainer: Tobias Kieslich # Contributor: Alois Nespor alois.nespor@gmail.com pkgname=xfburn pkgver=0.4.3 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') pkgdesc="a simple CD/DVD burning tool based on libburnia libraries" url="http://goodies.xfce.org/projects/applications/xfburn" @@ -14,11 +14,17 @@ install=${pkgname}.install depends=('libburn>=1.0.6.pl00' 'libisofs>=1.0.6' 'libxfcegui4>=4.8.1' 'exo>=0.6.0' 'gstreamer0.10-base>=0.10.26' 'hicolor-icon-theme' 'desktop-file-utils' 'librsvg') makedepends=('intltool') -source=(http://www.xfce.org/archive/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2) -md5sums=('147cdc2d909e751125be16103b8dc81f') +source=(http://www.xfce.org/archive/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2 + fix_empty_dir_segfault.diff) +md5sums=('147cdc2d909e751125be16103b8dc81f' + '82a85be2442c42ab93de95e21c6c11b0') build() { cd ${srcdir}/$pkgname-$pkgver + + # fix https://bugs.archlinux.org/task/26121 + patch -Np0 -i ${srcdir}/fix_empty_dir_segfault.diff + ./configure --prefix=/usr \ --enable-gstreamer \ --enable-dbus \ diff --git a/extra/xfburn/fix_empty_dir_segfault.diff b/extra/xfburn/fix_empty_dir_segfault.diff new file mode 100644 index 000000000..af3fe07c8 --- /dev/null +++ b/extra/xfburn/fix_empty_dir_segfault.diff @@ -0,0 +1,48 @@ +--- xfburn/xfburn-data-composition.c 2011-02-17 16:37:03.000000000 +0100 ++++ xfburn/xfburn-data-composition_patched.c 2011-02-17 16:40:40.000000000 +0100 +@@ -1874,26 +1874,29 @@ + g_error ("Failed adding %s as a node to the image: code %X!", src, r); + } + +- basename = g_path_get_basename (src); ++ /* Check names only for items not manually created (#613563) */ ++ if (type != DATA_COMPOSITION_TYPE_DIRECTORY || src != NULL) { ++ basename = g_path_get_basename (src); ++ ++ /* check if the file has been renamed */ ++ if (strcmp (basename, name) != 0) { ++ /* rename the iso_node */ ++ r = iso_node_set_name (node, name); ++ ++ if (r == 0) { ++ /* The first string is the renamed name, the second one the original name */ ++ xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src); ++ ++ g_free (basename); ++ g_free (name); ++ g_free (src); + +- /* check if the file has been renamed */ +- if (strcmp (basename, name) != 0) { +- /* rename the iso_node */ +- r = iso_node_set_name (node, name); +- +- if (r == 0) { +- /* The first string is the renamed name, the second one the original name */ +- xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src); +- +- g_free (basename); +- g_free (name); +- g_free (src); +- +- continue; ++ continue; ++ } + } ++ g_free (basename); + } + +- g_free (basename); + g_free (name); + g_free (src); + -- cgit v1.2.3-54-g00ecf