diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-26 13:21:55 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-26 13:21:55 -0300 |
| commit | 60e119a0f3297314f4bcd2b2b821eccd28992cd6 (patch) | |
| tree | 83078f34ba0e5220164fe3f3b5cdff27ce87aaf9 /community/subtitleeditor | |
| parent | 8aa6cf7dacd74c155e7b2dd7af68a5cb4460e5b3 (diff) | |
| parent | 21efc9511d14394cc1d8426e2e0a6c668964fbe9 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/lightspark/PKGBUILD
community/camlp5/PKGBUILD
community/gnote/PKGBUILD
community/gtk-gnutella/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/koffice/PKGBUILD
extra/pyopenssl/PKGBUILD
extra/virtuoso/PKGBUILD
gnome-unstable/empathy/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/folks/PKGBUILD
gnome-unstable/gdm/PKGBUILD
gnome-unstable/gjs/PKGBUILD
gnome-unstable/gnome-games/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/gnome-shell/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
gnome-unstable/gthumb/PKGBUILD
gnome-unstable/libgnomekbd/PKGBUILD
gnome-unstable/libpeas/PKGBUILD
gnome-unstable/mutter/PKGBUILD
gnome-unstable/totem/PKGBUILD
multilib/lib32-libffi/PKGBUILD
multilib/wine/PKGBUILD
testing/xorg-server/PKGBUILD
Diffstat (limited to 'community/subtitleeditor')
| -rw-r--r-- | community/subtitleeditor/PKGBUILD | 19 | ||||
| -rw-r--r-- | community/subtitleeditor/fix-taking-address-of-temporary-error.patch | 56 |
2 files changed, 70 insertions, 5 deletions
diff --git a/community/subtitleeditor/PKGBUILD b/community/subtitleeditor/PKGBUILD index 8ca4582bf..e0d167b0d 100644 --- a/community/subtitleeditor/PKGBUILD +++ b/community/subtitleeditor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 38397 2011-01-26 20:18:42Z jelle $ +# $Id: PKGBUILD 55853 2011-09-23 20:07:37Z lcarlier $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=subtitleeditor -pkgver=0.38.0 +pkgver=0.39.0 pkgrel=1 pkgdesc="A GTK+2 tool to edit subtitles for GNU/Linux/*BSD" arch=('i686' 'x86_64' 'mips64el') @@ -16,13 +16,22 @@ optdepends=('gstreamer0.10-ffmpeg: to be able to view movies inside the subtitle options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog -source=(http://download.gna.org/$pkgname/0.38/$pkgname-$pkgver.tar.gz) -md5sums=('2c4d7d4bd79f45effcea279a2e06ca66') +source=(http://download.gna.org/$pkgname/0.39/$pkgname-$pkgver.tar.gz + fix-taking-address-of-temporary-error.patch) +md5sums=('17666e652edd27abfd3104a82385f6a8' + '13e4fde005a9017da9fd24a5c2b928ed') build() { cd ${srcdir}/$pkgname-$pkgver + # fix building with gcc-4.6.0, taken from upstream + patch -Np1 -i "../fix-taking-address-of-temporary-error.patch" + ./configure --prefix=/usr - make + make +} +package() { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR=${pkgdir} install } diff --git a/community/subtitleeditor/fix-taking-address-of-temporary-error.patch b/community/subtitleeditor/fix-taking-address-of-temporary-error.patch new file mode 100644 index 000000000..a35746d62 --- /dev/null +++ b/community/subtitleeditor/fix-taking-address-of-temporary-error.patch @@ -0,0 +1,56 @@ +--- trunk/plugins/subtitleformats/sami/sami.cc 2011/06/18 08:06:45 772 ++++ trunk/plugins/subtitleformats/sami/sami.cc 2011/07/02 13:01:33 777 +@@ -155,7 +155,7 @@ + int state = 0; + Glib::ustring line; + Glib::ustring text; +- Subtitle* curSt; ++ Subtitle curSt; + char tmptext[MAXBUF+1] = ""; + char *p = NULL, *q = NULL; + if (!file.getline(line)) +@@ -174,8 +174,8 @@ + start_sync = utility::string_to_int(inptr + 6); + + // Get a line from the current subtitle on memory +- curSt = &subtitles.append(); +- curSt->set_start(start_sync); ++ curSt = subtitles.append(); ++ curSt.set_start(start_sync); + + state = SAMI_STATE_SYNC_START; + continue; +@@ -239,14 +239,14 @@ + // Now we are sure that this line is the end sync. + + end_sync = utility::string_to_int(q + 6); +- curSt->set_end(end_sync); ++ curSt.set_end(end_sync); + + *p = '\0'; + trail_space(tmptext); + + // finalize the end sync of current line + if (tmptext[0] != '\0') +- curSt->set_text(tmptext); ++ curSt.set_text(tmptext); + + // an important check if this is end sync. + // Is there any delimiter " " in this line? +@@ -276,14 +276,14 @@ + else + { + end_sync = SAMISYNC_MAXVAL; +- curSt->set_end(end_sync); ++ curSt.set_end(end_sync); + + *p = '\0'; + trail_space(tmptext); + + // finalize the end sync of current line + if (tmptext[0] != '\0') +- curSt->set_text(tmptext); ++ curSt.set_text(tmptext); + + state = SAMI_STATE_FORCE_QUIT; + break; |