Date: Saturday, May 7, 2016 @ 15:02:52 Author: arojas Revision: 174097
archrelease: copy trunk to community-i686, community-x86_64 Added: snes9x/repos/community-i686/PKGBUILD (from rev 174096, snes9x/trunk/PKGBUILD) snes9x/repos/community-i686/snes9x-fix-crash.patch (from rev 174096, snes9x/trunk/snes9x-fix-crash.patch) snes9x/repos/community-i686/snes9x-gtk2.24.diff.gz (from rev 174096, snes9x/trunk/snes9x-gtk2.24.diff.gz) snes9x/repos/community-x86_64/PKGBUILD (from rev 174096, snes9x/trunk/PKGBUILD) snes9x/repos/community-x86_64/snes9x-fix-crash.patch (from rev 174096, snes9x/trunk/snes9x-fix-crash.patch) snes9x/repos/community-x86_64/snes9x-gtk2.24.diff.gz (from rev 174096, snes9x/trunk/snes9x-gtk2.24.diff.gz) Deleted: snes9x/repos/community-i686/PKGBUILD snes9x/repos/community-i686/snes9x-fix-crash.patch snes9x/repos/community-i686/snes9x-gtk.install snes9x/repos/community-i686/snes9x-gtk2.24.diff.gz snes9x/repos/community-x86_64/PKGBUILD snes9x/repos/community-x86_64/snes9x-fix-crash.patch snes9x/repos/community-x86_64/snes9x-gtk.install snes9x/repos/community-x86_64/snes9x-gtk2.24.diff.gz -----------------------------------------+ /PKGBUILD | 120 ++++++++++++++++++++++++++++++ /snes9x-fix-crash.patch | 60 +++++++++++++++ community-i686/PKGBUILD | 61 --------------- community-i686/snes9x-fix-crash.patch | 30 ------- community-i686/snes9x-gtk.install | 12 --- community-x86_64/PKGBUILD | 61 --------------- community-x86_64/snes9x-fix-crash.patch | 30 ------- community-x86_64/snes9x-gtk.install | 12 --- 8 files changed, 180 insertions(+), 206 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-05-07 13:02:12 UTC (rev 174096) +++ community-i686/PKGBUILD 2016-05-07 13:02:52 UTC (rev 174097) @@ -1,61 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgbase=snes9x -pkgname=('snes9x' 'snes9x-gtk') -pkgver=1.53 -pkgrel=9 -arch=('i686' 'x86_64') -url="https://code.google.com/p/snes9x-gtk/" -license=('custom') -makedepends=('intltool' 'nasm' 'mesa' 'libpulse' 'libpng' 'sdl' 'gtk2' 'libxv' - 'desktop-file-utils' 'gnome-icon-theme') -source=(http://snes9x-gtk.googlecode.com/files/${pkgbase}-${pkgver}-src.tar.bz2 - snes9x-gtk2.24.diff.gz snes9x-fix-crash.patch) -sha1sums=('57be6480369f66b9aaaeb722789ce114f58ed1e2' - '680dbe0a70f1821bc7931539e72f5a1a95e3938c' - '995495c68ffc00d8266d10a7bd8fc74fb6c147b1') - -prepare() { - cd ${pkgbase}-${pkgver}-src - patch -p1 -i "${srcdir}/snes9x-gtk2.24.diff" - patch -p1 -i "${srcdir}/snes9x-fix-crash.patch" -} - -build() { - cd ${pkgbase}-${pkgver}-src/unix - ./configure --prefix=/usr --with-sdd1-decomp --enable-netplay - make - - cd ../gtk - ./configure --prefix=/usr --with-sdd1-decomp --with-netplay --with-opengl - make -} - -package_snes9x() { - pkgdesc="A portable Emulator for the Super Nintendo Entertainment System" - depends=('libpng' 'libxext' 'libsm') - - cd ${pkgbase}-${pkgver}-src/unix - install -D -m755 snes9x "${pkgdir}/usr/bin/snes9x" - install -d "${pkgdir}/usr/share/doc/${pkgname}" - install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \ - "${pkgdir}/usr/share/doc/${pkgname}/" - install -D -m644 "${srcdir}/${pkgbase}-${pkgver}-src/docs/snes9x-license.txt" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_snes9x-gtk() { - pkgdesc="A portable Emulator for the Super Nintendo Entertainment System - GTK version" - license=('custom' 'LGPL') - depends=('sdl' 'libpulse' 'gtk2' 'libxv' 'desktop-file-utils' 'gnome-icon-theme') - install=snes9x-gtk.install - - cd ${pkgbase}-${pkgver}-src/gtk - make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/usr/share/doc/${pkgname}" - install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \ - "${pkgdir}/usr/share/doc/${pkgname}/" - install -D -m644 "${srcdir}/${pkgbase}-${pkgver}-src/docs/snes9x-license.txt" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: snes9x/repos/community-i686/PKGBUILD (from rev 174096, snes9x/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-05-07 13:02:52 UTC (rev 174097) @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgbase=snes9x +pkgname=('snes9x' 'snes9x-gtk') +pkgver=1.53 +pkgrel=10 +arch=('i686' 'x86_64') +url="https://code.google.com/p/snes9x-gtk/" +license=('custom') +makedepends=('intltool' 'nasm' 'mesa' 'libpulse' 'libpng' 'sdl' 'gtk2' 'libxv' + 'desktop-file-utils' 'gnome-icon-theme') +source=(http://snes9x-gtk.googlecode.com/files/${pkgbase}-${pkgver}-src.tar.bz2 + snes9x-gtk2.24.diff.gz snes9x-fix-crash.patch) +sha1sums=('57be6480369f66b9aaaeb722789ce114f58ed1e2' + '680dbe0a70f1821bc7931539e72f5a1a95e3938c' + '995495c68ffc00d8266d10a7bd8fc74fb6c147b1') + +prepare() { + cd ${pkgbase}-${pkgver}-src + patch -p1 -i "${srcdir}/snes9x-gtk2.24.diff" + patch -p1 -i "${srcdir}/snes9x-fix-crash.patch" +} + +build() { + cd ${pkgbase}-${pkgver}-src/unix + ./configure --prefix=/usr --with-sdd1-decomp --enable-netplay + make + + cd ../gtk + ./configure --prefix=/usr --with-sdd1-decomp --with-netplay --with-opengl + make +} + +package_snes9x() { + pkgdesc="A portable Emulator for the Super Nintendo Entertainment System" + depends=('libpng' 'libxext' 'libsm') + + cd ${pkgbase}-${pkgver}-src/unix + install -D -m755 snes9x "${pkgdir}/usr/bin/snes9x" + install -d "${pkgdir}/usr/share/doc/${pkgname}" + install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \ + "${pkgdir}/usr/share/doc/${pkgname}/" + install -D -m644 "${srcdir}/${pkgbase}-${pkgver}-src/docs/snes9x-license.txt" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_snes9x-gtk() { + pkgdesc="A portable Emulator for the Super Nintendo Entertainment System - GTK version" + license=('custom' 'LGPL') + depends=('sdl' 'libpulse' 'gtk2' 'libxv' 'desktop-file-utils' 'gnome-icon-theme') + + cd ${pkgbase}-${pkgver}-src/gtk + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}/usr/share/doc/${pkgname}" + install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \ + "${pkgdir}/usr/share/doc/${pkgname}/" + install -D -m644 "${srcdir}/${pkgbase}-${pkgver}-src/docs/snes9x-license.txt" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Deleted: community-i686/snes9x-fix-crash.patch =================================================================== --- community-i686/snes9x-fix-crash.patch 2016-05-07 13:02:12 UTC (rev 174096) +++ community-i686/snes9x-fix-crash.patch 2016-05-07 13:02:52 UTC (rev 174097) @@ -1,30 +0,0 @@ -From 6d74746342a73cf65db215f4fdecdfb0cae66792 Mon Sep 17 00:00:00 2001 -From: Brandon Wright <bear...@gmail.com> -Date: Mon, 10 Feb 2014 16:28:05 -0600 -Subject: [PATCH] Fix bug caused by virtual directories. - ---- - gtk/src/gtk_file.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/gtk/src/gtk_file.cpp b/gtk/src/gtk_file.cpp -index a0df75d..9c0e000 100644 ---- a/gtk/src/gtk_file.cpp -+++ b/gtk/src/gtk_file.cpp -@@ -465,8 +465,11 @@ S9xOpenROMDialog (void) - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - directory = - gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); -- strncpy (gui_config->last_directory, directory, PATH_MAX); -- g_free (directory); -+ if (directory) -+ { -+ strncpy (gui_config->last_directory, directory, PATH_MAX); -+ g_free (directory); -+ } - } - - else --- -1.9.3 - Copied: snes9x/repos/community-i686/snes9x-fix-crash.patch (from rev 174096, snes9x/trunk/snes9x-fix-crash.patch) =================================================================== --- community-i686/snes9x-fix-crash.patch (rev 0) +++ community-i686/snes9x-fix-crash.patch 2016-05-07 13:02:52 UTC (rev 174097) @@ -0,0 +1,30 @@ +From 6d74746342a73cf65db215f4fdecdfb0cae66792 Mon Sep 17 00:00:00 2001 +From: Brandon Wright <bear...@gmail.com> +Date: Mon, 10 Feb 2014 16:28:05 -0600 +Subject: [PATCH] Fix bug caused by virtual directories. + +--- + gtk/src/gtk_file.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/gtk/src/gtk_file.cpp b/gtk/src/gtk_file.cpp +index a0df75d..9c0e000 100644 +--- a/gtk/src/gtk_file.cpp ++++ b/gtk/src/gtk_file.cpp +@@ -465,8 +465,11 @@ S9xOpenROMDialog (void) + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + directory = + gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); +- strncpy (gui_config->last_directory, directory, PATH_MAX); +- g_free (directory); ++ if (directory) ++ { ++ strncpy (gui_config->last_directory, directory, PATH_MAX); ++ g_free (directory); ++ } + } + + else +-- +1.9.3 + Deleted: community-i686/snes9x-gtk.install =================================================================== --- community-i686/snes9x-gtk.install 2016-05-07 13:02:12 UTC (rev 174096) +++ community-i686/snes9x-gtk.install 2016-05-07 13:02:52 UTC (rev 174097) @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove () { - post_install $1 -} Deleted: community-i686/snes9x-gtk2.24.diff.gz =================================================================== (Binary files differ) Copied: snes9x/repos/community-i686/snes9x-gtk2.24.diff.gz (from rev 174096, snes9x/trunk/snes9x-gtk2.24.diff.gz) =================================================================== (Binary files differ) Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-05-07 13:02:12 UTC (rev 174096) +++ community-x86_64/PKGBUILD 2016-05-07 13:02:52 UTC (rev 174097) @@ -1,61 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgbase=snes9x -pkgname=('snes9x' 'snes9x-gtk') -pkgver=1.53 -pkgrel=9 -arch=('i686' 'x86_64') -url="https://code.google.com/p/snes9x-gtk/" -license=('custom') -makedepends=('intltool' 'nasm' 'mesa' 'libpulse' 'libpng' 'sdl' 'gtk2' 'libxv' - 'desktop-file-utils' 'gnome-icon-theme') -source=(http://snes9x-gtk.googlecode.com/files/${pkgbase}-${pkgver}-src.tar.bz2 - snes9x-gtk2.24.diff.gz snes9x-fix-crash.patch) -sha1sums=('57be6480369f66b9aaaeb722789ce114f58ed1e2' - '680dbe0a70f1821bc7931539e72f5a1a95e3938c' - '995495c68ffc00d8266d10a7bd8fc74fb6c147b1') - -prepare() { - cd ${pkgbase}-${pkgver}-src - patch -p1 -i "${srcdir}/snes9x-gtk2.24.diff" - patch -p1 -i "${srcdir}/snes9x-fix-crash.patch" -} - -build() { - cd ${pkgbase}-${pkgver}-src/unix - ./configure --prefix=/usr --with-sdd1-decomp --enable-netplay - make - - cd ../gtk - ./configure --prefix=/usr --with-sdd1-decomp --with-netplay --with-opengl - make -} - -package_snes9x() { - pkgdesc="A portable Emulator for the Super Nintendo Entertainment System" - depends=('libpng' 'libxext' 'libsm') - - cd ${pkgbase}-${pkgver}-src/unix - install -D -m755 snes9x "${pkgdir}/usr/bin/snes9x" - install -d "${pkgdir}/usr/share/doc/${pkgname}" - install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \ - "${pkgdir}/usr/share/doc/${pkgname}/" - install -D -m644 "${srcdir}/${pkgbase}-${pkgver}-src/docs/snes9x-license.txt" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_snes9x-gtk() { - pkgdesc="A portable Emulator for the Super Nintendo Entertainment System - GTK version" - license=('custom' 'LGPL') - depends=('sdl' 'libpulse' 'gtk2' 'libxv' 'desktop-file-utils' 'gnome-icon-theme') - install=snes9x-gtk.install - - cd ${pkgbase}-${pkgver}-src/gtk - make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/usr/share/doc/${pkgname}" - install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \ - "${pkgdir}/usr/share/doc/${pkgname}/" - install -D -m644 "${srcdir}/${pkgbase}-${pkgver}-src/docs/snes9x-license.txt" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: snes9x/repos/community-x86_64/PKGBUILD (from rev 174096, snes9x/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-05-07 13:02:52 UTC (rev 174097) @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgbase=snes9x +pkgname=('snes9x' 'snes9x-gtk') +pkgver=1.53 +pkgrel=10 +arch=('i686' 'x86_64') +url="https://code.google.com/p/snes9x-gtk/" +license=('custom') +makedepends=('intltool' 'nasm' 'mesa' 'libpulse' 'libpng' 'sdl' 'gtk2' 'libxv' + 'desktop-file-utils' 'gnome-icon-theme') +source=(http://snes9x-gtk.googlecode.com/files/${pkgbase}-${pkgver}-src.tar.bz2 + snes9x-gtk2.24.diff.gz snes9x-fix-crash.patch) +sha1sums=('57be6480369f66b9aaaeb722789ce114f58ed1e2' + '680dbe0a70f1821bc7931539e72f5a1a95e3938c' + '995495c68ffc00d8266d10a7bd8fc74fb6c147b1') + +prepare() { + cd ${pkgbase}-${pkgver}-src + patch -p1 -i "${srcdir}/snes9x-gtk2.24.diff" + patch -p1 -i "${srcdir}/snes9x-fix-crash.patch" +} + +build() { + cd ${pkgbase}-${pkgver}-src/unix + ./configure --prefix=/usr --with-sdd1-decomp --enable-netplay + make + + cd ../gtk + ./configure --prefix=/usr --with-sdd1-decomp --with-netplay --with-opengl + make +} + +package_snes9x() { + pkgdesc="A portable Emulator for the Super Nintendo Entertainment System" + depends=('libpng' 'libxext' 'libsm') + + cd ${pkgbase}-${pkgver}-src/unix + install -D -m755 snes9x "${pkgdir}/usr/bin/snes9x" + install -d "${pkgdir}/usr/share/doc/${pkgname}" + install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \ + "${pkgdir}/usr/share/doc/${pkgname}/" + install -D -m644 "${srcdir}/${pkgbase}-${pkgver}-src/docs/snes9x-license.txt" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_snes9x-gtk() { + pkgdesc="A portable Emulator for the Super Nintendo Entertainment System - GTK version" + license=('custom' 'LGPL') + depends=('sdl' 'libpulse' 'gtk2' 'libxv' 'desktop-file-utils' 'gnome-icon-theme') + + cd ${pkgbase}-${pkgver}-src/gtk + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}/usr/share/doc/${pkgname}" + install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \ + "${pkgdir}/usr/share/doc/${pkgname}/" + install -D -m644 "${srcdir}/${pkgbase}-${pkgver}-src/docs/snes9x-license.txt" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Deleted: community-x86_64/snes9x-fix-crash.patch =================================================================== --- community-x86_64/snes9x-fix-crash.patch 2016-05-07 13:02:12 UTC (rev 174096) +++ community-x86_64/snes9x-fix-crash.patch 2016-05-07 13:02:52 UTC (rev 174097) @@ -1,30 +0,0 @@ -From 6d74746342a73cf65db215f4fdecdfb0cae66792 Mon Sep 17 00:00:00 2001 -From: Brandon Wright <bear...@gmail.com> -Date: Mon, 10 Feb 2014 16:28:05 -0600 -Subject: [PATCH] Fix bug caused by virtual directories. - ---- - gtk/src/gtk_file.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/gtk/src/gtk_file.cpp b/gtk/src/gtk_file.cpp -index a0df75d..9c0e000 100644 ---- a/gtk/src/gtk_file.cpp -+++ b/gtk/src/gtk_file.cpp -@@ -465,8 +465,11 @@ S9xOpenROMDialog (void) - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - directory = - gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); -- strncpy (gui_config->last_directory, directory, PATH_MAX); -- g_free (directory); -+ if (directory) -+ { -+ strncpy (gui_config->last_directory, directory, PATH_MAX); -+ g_free (directory); -+ } - } - - else --- -1.9.3 - Copied: snes9x/repos/community-x86_64/snes9x-fix-crash.patch (from rev 174096, snes9x/trunk/snes9x-fix-crash.patch) =================================================================== --- community-x86_64/snes9x-fix-crash.patch (rev 0) +++ community-x86_64/snes9x-fix-crash.patch 2016-05-07 13:02:52 UTC (rev 174097) @@ -0,0 +1,30 @@ +From 6d74746342a73cf65db215f4fdecdfb0cae66792 Mon Sep 17 00:00:00 2001 +From: Brandon Wright <bear...@gmail.com> +Date: Mon, 10 Feb 2014 16:28:05 -0600 +Subject: [PATCH] Fix bug caused by virtual directories. + +--- + gtk/src/gtk_file.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/gtk/src/gtk_file.cpp b/gtk/src/gtk_file.cpp +index a0df75d..9c0e000 100644 +--- a/gtk/src/gtk_file.cpp ++++ b/gtk/src/gtk_file.cpp +@@ -465,8 +465,11 @@ S9xOpenROMDialog (void) + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + directory = + gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); +- strncpy (gui_config->last_directory, directory, PATH_MAX); +- g_free (directory); ++ if (directory) ++ { ++ strncpy (gui_config->last_directory, directory, PATH_MAX); ++ g_free (directory); ++ } + } + + else +-- +1.9.3 + Deleted: community-x86_64/snes9x-gtk.install =================================================================== --- community-x86_64/snes9x-gtk.install 2016-05-07 13:02:12 UTC (rev 174096) +++ community-x86_64/snes9x-gtk.install 2016-05-07 13:02:52 UTC (rev 174097) @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove () { - post_install $1 -} Deleted: community-x86_64/snes9x-gtk2.24.diff.gz =================================================================== (Binary files differ) Copied: snes9x/repos/community-x86_64/snes9x-gtk2.24.diff.gz (from rev 174096, snes9x/trunk/snes9x-gtk2.24.diff.gz) =================================================================== (Binary files differ)