[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2020-12-19 Thread Evangelos Foutras via arch-commits
Date: Saturday, December 19, 2020 @ 09:51:09
  Author: foutrelis
Revision: 779879

upgpkg: aegisub 3.2.2-44: icu 68.2 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-19 09:51:08 UTC (rev 779878)
+++ PKGBUILD2020-12-19 09:51:09 UTC (rev 779879)
@@ -4,7 +4,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=43
+pkgrel=44
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=(x86_64)
 url=http://www.aegisub.org


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2020-12-12 Thread Evangelos Foutras via arch-commits
Date: Saturday, December 12, 2020 @ 16:35:01
  Author: foutrelis
Revision: 773458

upgpkg: aegisub 3.2.2-43: boost 1.75.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-12 16:34:13 UTC (rev 773457)
+++ PKGBUILD2020-12-12 16:35:01 UTC (rev 773458)
@@ -4,7 +4,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=42
+pkgrel=43
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=(x86_64)
 url=http://www.aegisub.org


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2020-12-06 Thread Evangelos Foutras via arch-commits
Date: Sunday, December 6, 2020 @ 23:31:49
  Author: foutrelis
Revision: 771326

upgpkg: aegisub 3.2.2-42: boost 1.74.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-06 23:28:55 UTC (rev 771325)
+++ PKGBUILD2020-12-06 23:31:49 UTC (rev 771326)
@@ -4,7 +4,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=41
+pkgrel=42
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=(x86_64)
 url=http://www.aegisub.org


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2020-08-28 Thread Maxime Gauduin via arch-commits
Date: Friday, August 28, 2020 @ 11:31:24
  Author: alucryd
Revision: 690565

FS#67153: aegisub 3.2.2-40

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-28 11:31:08 UTC (rev 690564)
+++ PKGBUILD2020-08-28 11:31:24 UTC (rev 690565)
@@ -4,7 +4,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=39
+pkgrel=40
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=(x86_64)
 url=http://www.aegisub.org
@@ -33,11 +33,12 @@
   mesa
 )
 source=(
-  git+https://github.com/Aegisub/Aegisub.git#tag=v${pkgver}
+  git+https://github.com/Aegisub/Aegisub.git?signed#tag=v${pkgver}
   boost-1.68.patch
   icu59.patch
   make-4.3.patch
 )
+validpgpkeys=(6DD9508BCB1CE31AF295FF9B6A889F50A8B00C08) # Thomas Goyne 

 sha256sums=(
   SKIP
   aa1689a2204f6a617000f3380b8dea9c3dca4f500d0643e05172750c49cc5a21


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2020-04-29 Thread Evangelos Foutras via arch-commits
Date: Wednesday, April 29, 2020 @ 14:34:50
  Author: foutrelis
Revision: 622264

icu 67.1 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-29 14:32:25 UTC (rev 622263)
+++ PKGBUILD2020-04-29 14:34:50 UTC (rev 622264)
@@ -4,7 +4,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=38
+pkgrel=39
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=(x86_64)
 url=http://www.aegisub.org


[arch-commits] Commit in aegisub/trunk (PKGBUILD make-4.3.patch)

2020-04-29 Thread Evangelos Foutras via arch-commits
Date: Wednesday, April 29, 2020 @ 14:32:25
  Author: foutrelis
Revision: 622263

Fix build with make 4.3

Added:
  aegisub/trunk/make-4.3.patch
Modified:
  aegisub/trunk/PKGBUILD

+
 PKGBUILD   |3 +++
 make-4.3.patch |   23 +++
 2 files changed, 26 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-29 14:23:02 UTC (rev 622262)
+++ PKGBUILD2020-04-29 14:32:25 UTC (rev 622263)
@@ -36,11 +36,13 @@
   git+https://github.com/Aegisub/Aegisub.git#tag=v${pkgver}
   boost-1.68.patch
   icu59.patch
+  make-4.3.patch
 )
 sha256sums=(
   SKIP
   aa1689a2204f6a617000f3380b8dea9c3dca4f500d0643e05172750c49cc5a21
   29d8cc91e73602d5e3c8517c977dcc77cb84af7d42787f510d487d0a6abf7fa6
+  1e350a04c152075b369176f8e0b7f691a792de0d5091568e2388e6bd677180e1
 )
 
 prepare() {
@@ -51,6 +53,7 @@
   sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i 
tools/Makefile # missing link flag
   sed 's/^Exec=/Exec=env GDK_BACKEND=x11 /' -i 
packages/desktop/aegisub.desktop.template.in # fix running under wayland
   patch -Np1 -i ../icu59.patch
+  patch -Np1 -i ../make-4.3.patch
 
   ./autogen.sh
 }

Added: make-4.3.patch
===
--- make-4.3.patch  (rev 0)
+++ make-4.3.patch  2020-04-29 14:32:25 UTC (rev 622263)
@@ -0,0 +1,23 @@
+From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
+From: wangqr 
+Date: Mon, 17 Feb 2020 14:42:07 +0800
+Subject: [PATCH] Use target name without directory in $*_OBJ macro
+
+Fix Aegisub/Aegisub#171
+---
+ Makefile.target | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.target b/Makefile.target
+index 516ef3c24..5c4c5d259 100644
+--- a/Makefile.target
 b/Makefile.target
+@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
+ # Libraries contain all object files they depend on (but they may depend on 
other files)
+ # Not using libtool on OS X because it has an unsilenceable warning about a
+ # compatibility issue with BSD 4.3 (wtf)
+-lib%.a: $$($$*_OBJ)
++lib%.a: $$($$(*F)_OBJ)
+   @$(BIN_MKDIR_P) $(dir $@)
+   $(BIN_AR) cru $@ $(filter %.o,$^)
+   $(BIN_RANLIB) $@


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2020-01-27 Thread Felix Yan via arch-commits
Date: Tuesday, January 28, 2020 @ 02:27:24
  Author: felixonmars
Revision: 556982

boost 1.72.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-28 02:26:50 UTC (rev 556981)
+++ PKGBUILD2020-01-28 02:27:24 UTC (rev 556982)
@@ -4,7 +4,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=37
+pkgrel=38
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=(x86_64)
 url=http://www.aegisub.org


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2019-11-11 Thread Felix Yan via arch-commits
Date: Tuesday, November 12, 2019 @ 01:13:30
  Author: felixonmars
Revision: 526871

icu 65.1 / poppler 0.82.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-12 01:12:34 UTC (rev 526870)
+++ PKGBUILD2019-11-12 01:13:30 UTC (rev 526871)
@@ -4,7 +4,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=36
+pkgrel=37
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=(x86_64)
 url=http://www.aegisub.org


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2019-09-13 Thread Felix Yan via arch-commits
Date: Friday, September 13, 2019 @ 10:35:47
  Author: felixonmars
Revision: 510254

boost 1.71.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-13 10:34:34 UTC (rev 510253)
+++ PKGBUILD2019-09-13 10:35:47 UTC (rev 510254)
@@ -4,7 +4,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=35
+pkgrel=36
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=(x86_64)
 url=http://www.aegisub.org


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2019-05-17 Thread Maxime Gauduin via arch-commits
Date: Friday, May 17, 2019 @ 09:02:36
  Author: alucryd
Revision: 467662

upgpkg: aegisub 3.2.2-35

Modified:
  aegisub/trunk/PKGBUILD(contents, properties)

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-17 08:32:17 UTC (rev 467661)
+++ PKGBUILD2019-05-17 09:02:36 UTC (rev 467662)
@@ -4,7 +4,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=34
+pkgrel=35
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=(x86_64)
 url=http://www.aegisub.org
@@ -49,6 +49,7 @@
   patch -Np1 -i ../boost-1.68.patch
   sed 's|gil/gil_all.hpp|gil.hpp|g' -i src/*.cpp # boost 1.69
   sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i 
tools/Makefile # missing link flag
+  sed 's/^Exec=/Exec=env GDK_BACKEND=x11 /' -i 
packages/desktop/aegisub.desktop.template.in # fix running under wayland
   patch -Np1 -i ../icu59.patch
 
   ./autogen.sh


Property changes on: aegisub/trunk/PKGBUILD
___
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2019-04-05 Thread Felix Yan via arch-commits
Date: Friday, April 5, 2019 @ 14:56:24
  Author: felixonmars
Revision: 449843

icu 64.1 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-05 14:55:05 UTC (rev 449842)
+++ PKGBUILD2019-04-05 14:56:24 UTC (rev 449843)
@@ -4,7 +4,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=33
+pkgrel=34
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=(x86_64)
 url=http://www.aegisub.org


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2019-03-25 Thread Maxime Gauduin via arch-commits
Date: Monday, March 25, 2019 @ 11:00:57
  Author: alucryd
Revision: 443444

wxgtk 3.1.2 rebuild: aegisub 3.2.2-33

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |   67 -
 1 file changed, 45 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-25 10:50:41 UTC (rev 443443)
+++ PKGBUILD2019-03-25 11:00:57 UTC (rev 443444)
@@ -4,42 +4,65 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=32
+pkgrel=33
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
-arch=('x86_64')
-url='http://www.aegisub.org'
-license=('GPL' 'BSD')
-depends=('alsa-lib' 'boost-libs' 'fftw' 'fontconfig' 'gcc-libs' 'glibc'
- 'hunspell' 'icu' 'libgl' 'libpulse' 'wxgtk3' 'zlib'
- 'libass.so' 'libffms2.so')
-makedepends=('boost' 'intltool' 'mesa')
-source=("http://ftp.aegisub.org/pub/archives/releases/source/aegisub-${pkgver}.tar.xz;
-'boost-1.68.patch'
-'icu59.patch')
-sha256sums=('c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885'
-'aa1689a2204f6a617000f3380b8dea9c3dca4f500d0643e05172750c49cc5a21'
-'29d8cc91e73602d5e3c8517c977dcc77cb84af7d42787f510d487d0a6abf7fa6')
+arch=(x86_64)
+url=http://www.aegisub.org
+license=(
+  GPL
+  BSD
+)
+depends=(
+  alsa-lib
+  boost-libs
+  fftw
+  fontconfig
+  hunspell
+  icu
+  libass.so
+  libffms2.so
+  libgl
+  libpulse
+  wxgtk3
+  zlib
+)
+makedepends=(
+  boost
+  git
+  intltool
+  mesa
+)
+source=(
+  git+https://github.com/Aegisub/Aegisub.git#tag=v${pkgver}
+  boost-1.68.patch
+  icu59.patch
+)
+sha256sums=(
+  SKIP
+  aa1689a2204f6a617000f3380b8dea9c3dca4f500d0643e05172750c49cc5a21
+  29d8cc91e73602d5e3c8517c977dcc77cb84af7d42787f510d487d0a6abf7fa6
+)
 
 prepare() {
-  cd aegisub-${pkgver}
+  cd Aegisub
 
   patch -Np1 -i ../boost-1.68.patch
+  sed 's|gil/gil_all.hpp|gil.hpp|g' -i src/*.cpp # boost 1.69
+  sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i 
tools/Makefile # missing link flag
   patch -Np1 -i ../icu59.patch
-  # boost 1.69
-  sed 's|gil/gil_all.hpp|gil.hpp|g' -i src/*.cpp
 
-  sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i 
tools/Makefile
+  ./autogen.sh
 }
 
 build() {
-  cd aegisub-${pkgver}
+  cd Aegisub
 
   # http://site.icu-project.org/download/61#TOC-Migration-Issues
   CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
 
   ./configure \
---prefix='/usr' \
---with-wx-config='/usr/bin/wx-config-gtk3' \
+--prefix=/usr \
+--with-wx-config=/usr/bin/wx-config-gtk3 \
 --without-{portaudio,openal,oss} \
 --disable-update-checker
   make
@@ -46,7 +69,7 @@
 }
 
 package() {
-  cd aegisub-${pkgver}
+  cd Aegisub
 
   make DESTDIR="${pkgdir}" install
 


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2019-01-15 Thread Evangelos Foutras via arch-commits
Date: Tuesday, January 15, 2019 @ 10:49:29
  Author: foutrelis
Revision: 423292

boost 1.69.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-15 10:45:36 UTC (rev 423291)
+++ PKGBUILD2019-01-15 10:49:29 UTC (rev 423292)
@@ -4,7 +4,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=31
+pkgrel=32
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2019-01-15 Thread Levente Polyak via arch-commits
Date: Tuesday, January 15, 2019 @ 10:44:38
  Author: anthraxx
Revision: 423289

header import for for boost 1.69.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 ++
 1 file changed, 2 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-15 10:43:05 UTC (rev 423288)
+++ PKGBUILD2019-01-15 10:44:38 UTC (rev 423289)
@@ -25,6 +25,8 @@
 
   patch -Np1 -i ../boost-1.68.patch
   patch -Np1 -i ../icu59.patch
+  # boost 1.69
+  sed 's|gil/gil_all.hpp|gil.hpp|g' -i src/*.cpp
 
   sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i 
tools/Makefile
 }


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2018-11-17 Thread Evangelos Foutras via arch-commits
Date: Saturday, November 17, 2018 @ 16:54:18
  Author: foutrelis
Revision: 408581

hunspell 1.7.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-17 16:51:54 UTC (rev 408580)
+++ PKGBUILD2018-11-17 16:54:18 UTC (rev 408581)
@@ -4,7 +4,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=30
+pkgrel=31
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2018-10-22 Thread Felix Yan via arch-commits
Date: Monday, October 22, 2018 @ 23:06:44
  Author: felixonmars
Revision: 398577

icu 63.1 / poppler 0.70.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-22 23:02:01 UTC (rev 398576)
+++ PKGBUILD2018-10-22 23:06:44 UTC (rev 398577)
@@ -4,7 +4,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=29
+pkgrel=30
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2018-09-18 Thread Evangelos Foutras via arch-commits
Date: Tuesday, September 18, 2018 @ 07:07:37
  Author: foutrelis
Revision: 382942

boost 1.68.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-18 07:04:28 UTC (rev 382941)
+++ PKGBUILD2018-09-18 07:07:37 UTC (rev 382942)
@@ -4,7 +4,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=28
+pkgrel=29
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD boost-1.68.patch)

2018-09-17 Thread Evangelos Foutras via arch-commits
Date: Tuesday, September 18, 2018 @ 02:45:15
  Author: foutrelis
Revision: 382865

Fix build with boost 1.68

Added:
  aegisub/trunk/boost-1.68.patch
Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |3 +++
 boost-1.68.patch |   34 ++
 2 files changed, 37 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-18 02:34:42 UTC (rev 382864)
+++ PKGBUILD2018-09-18 02:45:15 UTC (rev 382865)
@@ -14,13 +14,16 @@
  'libass.so' 'libffms2.so')
 makedepends=('boost' 'intltool' 'mesa')
 
source=("http://ftp.aegisub.org/pub/archives/releases/source/aegisub-${pkgver}.tar.xz;
+'boost-1.68.patch'
 'icu59.patch')
 sha256sums=('c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885'
+'aa1689a2204f6a617000f3380b8dea9c3dca4f500d0643e05172750c49cc5a21'
 '29d8cc91e73602d5e3c8517c977dcc77cb84af7d42787f510d487d0a6abf7fa6')
 
 prepare() {
   cd aegisub-${pkgver}
 
+  patch -Np1 -i ../boost-1.68.patch
   patch -Np1 -i ../icu59.patch
 
   sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i 
tools/Makefile

Added: boost-1.68.patch
===
--- boost-1.68.patch(rev 0)
+++ boost-1.68.patch2018-09-18 02:45:15 UTC (rev 382865)
@@ -0,0 +1,34 @@
+From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
+From: Jan Beich 
+Date: Mon, 9 Jul 2018 20:15:29 +
+Subject: [PATCH] Keep using std::distance after Boost 1.68
+
+src/search_replace_engine.cpp:256:14: error: call to
+  'distance' is ambiguous
+count += distance(
+ ^~~~
+/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
+  boost::u32regex_iterator >]
+distance(_InputIter __first, _InputIter __last)
+^
+/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function 
[with SinglePassIterator =
+  boost::u32regex_iterator >]
+distance(SinglePassIterator first, SinglePassIterator last)
+^
+---
+ src/search_replace_engine.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/search_replace_engine.cpp b/src/search_replace_engine.cpp
+index 594c21e5e..14c71680d 100644
+--- a/src/search_replace_engine.cpp
 b/src/search_replace_engine.cpp
+@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
+   if (MatchState ms = matches(, 0)) {
+   auto& diag_field = 
diag.*get_dialogue_field(settings.field);
+   std::string const& text = diag_field.get();
+-  count += distance(
++  count += std::distance(
+   
boost::u32regex_iterator(begin(text), end(text), 
*ms.re),
+   
boost::u32regex_iterator());
+   diag_field = u32regex_replace(text, *ms.re, 
settings.replace_with);


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2018-08-06 Thread Evangelos Foutras via arch-commits
Date: Monday, August 6, 2018 @ 21:01:42
  Author: foutrelis
Revision: 369917

Perl 5.28 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-06 21:00:40 UTC (rev 369916)
+++ PKGBUILD2018-08-06 21:01:42 UTC (rev 369917)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=27
+pkgrel=28
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2018-05-30 Thread Evangelos Foutras via arch-commits
Date: Thursday, May 31, 2018 @ 02:19:29
  Author: foutrelis
Revision: 333861

boost 1.67.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-31 02:18:51 UTC (rev 333860)
+++ PKGBUILD2018-05-31 02:19:29 UTC (rev 333861)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=26
+pkgrel=27
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2018-03-27 Thread Evangelos Foutras via arch-commits
Date: Wednesday, March 28, 2018 @ 00:30:12
  Author: foutrelis
Revision: 313000

icu 61.1 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-28 00:25:57 UTC (rev 312999)
+++ PKGBUILD2018-03-28 00:30:12 UTC (rev 313000)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=25
+pkgrel=26
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2018-03-27 Thread Evangelos Foutras via arch-commits
Date: Tuesday, March 27, 2018 @ 22:42:48
  Author: foutrelis
Revision: 312977

Fix build with ICU 61

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |3 +++
 1 file changed, 3 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-27 22:24:06 UTC (rev 312976)
+++ PKGBUILD2018-03-27 22:42:48 UTC (rev 312977)
@@ -30,6 +30,9 @@
 build() {
   cd aegisub-${pkgver}
 
+  # http://site.icu-project.org/download/61#TOC-Migration-Issues
+  CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
+
   ./configure \
 --prefix='/usr' \
 --with-wx-config='/usr/bin/wx-config-gtk3' \


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2017-12-27 Thread Maxime Gauduin via arch-commits
Date: Wednesday, December 27, 2017 @ 13:32:24
  Author: alucryd
Revision: 276235

boost 1.66 rebuild: aegisub 3.2.2-25

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-27 13:28:28 UTC (rev 276234)
+++ PKGBUILD2017-12-27 13:32:24 UTC (rev 276235)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=24
+pkgrel=25
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2017-11-12 Thread Felix Yan
Date: Sunday, November 12, 2017 @ 14:45:39
  Author: felixonmars
Revision: 266369

icu 60.1 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-12 14:45:01 UTC (rev 266368)
+++ PKGBUILD2017-11-12 14:45:39 UTC (rev 266369)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=23
+pkgrel=24
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2017-09-12 Thread Bartłomiej Piotrowski
Date: Tuesday, September 12, 2017 @ 14:47:23
  Author: bpiotrowski
Revision: 257128

3.2.2-23: rebuild against boost 1.65.1

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-12 14:45:53 UTC (rev 257127)
+++ PKGBUILD2017-09-12 14:47:23 UTC (rev 257128)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=22
+pkgrel=23
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2017-06-05 Thread Maxime Gauduin
Date: Monday, June 5, 2017 @ 19:17:50
  Author: alucryd
Revision: 234404

aegisub 3.2.2-22: Use wxgtk3

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-05 18:53:41 UTC (rev 234403)
+++ PKGBUILD2017-06-05 19:17:50 UTC (rev 234404)
@@ -5,12 +5,14 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=21
+pkgrel=22
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'
 license=('GPL' 'BSD')
-depends=('boost-libs' 'ffms2' 'fftw' 'hunspell' 'wxgtk')
+depends=('alsa-lib' 'boost-libs' 'fftw' 'fontconfig' 'gcc-libs' 'glibc'
+ 'hunspell' 'icu' 'libgl' 'libpulse' 'wxgtk3' 'zlib'
+ 'libass.so' 'libffms2.so')
 makedepends=('boost' 'intltool' 'mesa')
 
source=("http://ftp.aegisub.org/pub/archives/releases/source/aegisub-${pkgver}.tar.xz;
 'icu59.patch')
@@ -30,6 +32,7 @@
 
   ./configure \
 --prefix='/usr' \
+--with-wx-config='/usr/bin/wx-config-gtk3' \
 --without-{portaudio,openal,oss} \
 --disable-update-checker
   make


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2017-05-19 Thread Maxime Gauduin
Date: Friday, May 19, 2017 @ 19:36:16
  Author: alucryd
Revision: 228633

upgpkg: aegisub 3.2.2-21

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-19 19:35:16 UTC (rev 228632)
+++ PKGBUILD2017-05-19 19:36:16 UTC (rev 228633)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=20
+pkgrel=21
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2017-04-26 Thread Evangelos Foutras
Date: Wednesday, April 26, 2017 @ 08:19:28
  Author: foutrelis
Revision: 225464

icu 59.1 / hunspell 1.6.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-26 08:19:20 UTC (rev 225463)
+++ PKGBUILD2017-04-26 08:19:28 UTC (rev 225464)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=19
+pkgrel=20
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD icu59.patch)

2017-04-26 Thread Evangelos Foutras
Date: Wednesday, April 26, 2017 @ 08:14:31
  Author: foutrelis
Revision: 225459

Fix build with ICU 59

Added:
  aegisub/trunk/icu59.patch
Modified:
  aegisub/trunk/PKGBUILD

-+
 PKGBUILD|8 ++--
 icu59.patch |   11 +++
 2 files changed, 17 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-26 08:10:41 UTC (rev 225458)
+++ PKGBUILD2017-04-26 08:14:31 UTC (rev 225459)
@@ -12,12 +12,16 @@
 license=('GPL' 'BSD')
 depends=('boost-libs' 'ffms2' 'fftw' 'hunspell' 'wxgtk')
 makedepends=('boost' 'intltool' 'mesa')
-source=("http://ftp.aegisub.org/pub/archives/releases/source/aegisub-${pkgver}.tar.xz;)
-sha256sums=('c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885')
+source=("http://ftp.aegisub.org/pub/archives/releases/source/aegisub-${pkgver}.tar.xz;
+'icu59.patch')
+sha256sums=('c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885'
+'29d8cc91e73602d5e3c8517c977dcc77cb84af7d42787f510d487d0a6abf7fa6')
 
 prepare() {
   cd aegisub-${pkgver}
 
+  patch -Np1 -i ../icu59.patch
+
   sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i 
tools/Makefile
 }
 

Added: icu59.patch
===
--- icu59.patch (rev 0)
+++ icu59.patch 2017-04-26 08:14:31 UTC (rev 225459)
@@ -0,0 +1,11 @@
+diff -upr aegisub-3.2.2.orig/src/utils.cpp aegisub-3.2.2/src/utils.cpp
+--- aegisub-3.2.2.orig/src/utils.cpp   2014-12-08 02:07:09.0 +0200
 aegisub-3.2.2/src/utils.cpp2017-04-26 11:11:15.438239182 +0300
+@@ -44,6 +44,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2017-03-26 Thread Maxime Gauduin
Date: Sunday, March 26, 2017 @ 14:35:46
  Author: alucryd
Revision: 219090

libass, libbluray, x265 rebuild: aegisub 3.2.2-19

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-26 14:18:50 UTC (rev 219089)
+++ PKGBUILD2017-03-26 14:35:46 UTC (rev 219090)
@@ -5,12 +5,12 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=18
+pkgrel=19
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'
 license=('GPL' 'BSD')
-depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'wxgtk')
+depends=('boost-libs' 'ffms2' 'fftw' 'hunspell' 'wxgtk')
 makedepends=('boost' 'intltool' 'mesa')
 
source=("http://ftp.aegisub.org/pub/archives/releases/source/aegisub-${pkgver}.tar.xz;)
 sha256sums=('c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885')


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2017-01-01 Thread Bartłomiej Piotrowski
Date: Monday, January 2, 2017 @ 07:14:01
  Author: bpiotrowski
Revision: 204159

upgpkg: aegisub 3.2.2-18

rebuild against boost 1.63.0

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-02 07:09:19 UTC (rev 204158)
+++ PKGBUILD2017-01-02 07:14:01 UTC (rev 204159)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=17
+pkgrel=18
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2016-11-28 Thread Felix Yan
Date: Monday, November 28, 2016 @ 15:27:28
  Author: felixonmars
Revision: 197161

icu 58.1 / poppler 0.49.0 / hunspell 1.5.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-28 15:17:36 UTC (rev 197160)
+++ PKGBUILD2016-11-28 15:27:28 UTC (rev 197161)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=16
+pkgrel=17
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2016-11-26 Thread Evangelos Foutras
Date: Saturday, November 26, 2016 @ 19:33:06
  Author: foutrelis
Revision: 196941

icu 58.1 / poppler 0.49.0 / hunspell 1.5.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-26 18:39:53 UTC (rev 196940)
+++ PKGBUILD2016-11-26 19:33:06 UTC (rev 196941)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=15
+pkgrel=16
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2016-10-09 Thread Maxime Gauduin
Date: Sunday, October 9, 2016 @ 18:39:08
  Author: alucryd
Revision: 191727

boost rebuild: aegisub 3.2.2-15

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-09 18:23:53 UTC (rev 191726)
+++ PKGBUILD2016-10-09 18:39:08 UTC (rev 191727)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=14
+pkgrel=15
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2016-10-08 Thread Bartłomiej Piotrowski
Date: Saturday, October 8, 2016 @ 11:52:55
  Author: bpiotrowski
Revision: 191628

upgpkg: aegisub 3.2.2-14

rebuild against boost 1.62.0

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-08 11:44:38 UTC (rev 191627)
+++ PKGBUILD2016-10-08 11:52:55 UTC (rev 191628)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=13
+pkgrel=14
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2016-08-20 Thread Maxime Gauduin
Date: Saturday, August 20, 2016 @ 10:08:15
  Author: alucryd
Revision: 187168

boost 1.16 rebuild: aegisub 3.2.2-13

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-20 09:53:25 UTC (rev 187167)
+++ PKGBUILD2016-08-20 10:08:15 UTC (rev 187168)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=12
+pkgrel=13
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2016-06-12 Thread Maxime Gauduin
Date: Sunday, June 12, 2016 @ 22:57:10
  Author: alucryd
Revision: 179740

upgpkg: aegisub 3.2.2-12

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-12 20:49:23 UTC (rev 179739)
+++ PKGBUILD2016-06-12 20:57:10 UTC (rev 179740)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=11
+pkgrel=12
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2016-05-12 Thread Evangelos Foutras
Date: Thursday, May 12, 2016 @ 13:35:46
  Author: foutrelis
Revision: 174951

boost 1.60.0-5 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-12 11:35:36 UTC (rev 174950)
+++ PKGBUILD2016-05-12 11:35:46 UTC (rev 174951)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=10
+pkgrel=11
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD aegisub.install)

2016-04-27 Thread Maxime Gauduin
Date: Wednesday, April 27, 2016 @ 21:14:16
  Author: alucryd
Revision: 172154

hook rebuild: aegisub 3.2.2-10

Modified:
  aegisub/trunk/PKGBUILD
Deleted:
  aegisub/trunk/aegisub.install

-+
 PKGBUILD|3 +--
 aegisub.install |   14 --
 2 files changed, 1 insertion(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-27 18:58:57 UTC (rev 172153)
+++ PKGBUILD2016-04-27 19:14:16 UTC (rev 172154)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=9
+pkgrel=10
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'
@@ -12,7 +12,6 @@
 license=('GPL' 'BSD')
 depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'wxgtk')
 makedepends=('boost' 'intltool' 'mesa')
-install='aegisub.install'
 
source=("http://ftp.aegisub.org/pub/archives/releases/source/aegisub-${pkgver}.tar.xz;)
 sha256sums=('c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885')
 

Deleted: aegisub.install
===
--- aegisub.install 2016-04-27 18:58:57 UTC (rev 172153)
+++ aegisub.install 2016-04-27 19:14:16 UTC (rev 172154)
@@ -1,14 +0,0 @@
-post_install() {
-gtk-update-icon-cache -ftq usr/share/icons/hicolor
-update-desktop-database -q
-}
-
-post_upgrade() {
-post_install
-}
-
-post_remove() {
-post_install
-}
-
-# vim: ts=2 sw=2 et:


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2016-04-02 Thread Evangelos Foutras
Date: Saturday, April 2, 2016 @ 21:59:11
  Author: foutrelis
Revision: 169277

icu 57.1 / poppler 0.42.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-02 19:19:17 UTC (rev 169276)
+++ PKGBUILD2016-04-02 19:59:11 UTC (rev 169277)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=8
+pkgrel=9
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2015-12-21 Thread Felix Yan
Date: Monday, December 21, 2015 @ 18:12:45
  Author: fyan
Revision: 153935

boost 1.60.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-21 16:47:53 UTC (rev 153934)
+++ PKGBUILD2015-12-21 17:12:45 UTC (rev 153935)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=7
+pkgrel=8
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2015-12-06 Thread Bartłomiej Piotrowski
Date: Monday, December 7, 2015 @ 06:53:05
  Author: bpiotrowski
Revision: 149621

C++11 ABI rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 05:53:04 UTC (rev 149620)
+++ PKGBUILD2015-12-07 05:53:05 UTC (rev 149621)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=6
+pkgrel=7
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2015-11-01 Thread Bartłomiej Piotrowski
Date: Sunday, November 1, 2015 @ 23:23:05
  Author: bpiotrowski
Revision: 145487

icu 56.1 / poppler 0.37.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-01 21:42:56 UTC (rev 145486)
+++ PKGBUILD2015-11-01 22:23:05 UTC (rev 145487)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=5
+pkgrel=6
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2015-10-15 Thread Felix Yan
Date: Thursday, October 15, 2015 @ 12:46:33
  Author: fyan
Revision: 144088

boost 1.59.0 rebuild

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-15 10:37:36 UTC (rev 144087)
+++ PKGBUILD2015-10-15 10:46:33 UTC (rev 144088)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=4
+pkgrel=5
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2015-05-26 Thread Maxime Gauduin
Date: Tuesday, May 26, 2015 @ 10:17:14
  Author: alucryd
Revision: 134147

FS#45064: aegisub 3.2.2-4

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-26 07:09:00 UTC (rev 134146)
+++ PKGBUILD2015-05-26 08:17:14 UTC (rev 134147)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=3
+pkgrel=4
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'
@@ -16,6 +16,12 @@
 
source=(http://ftp.aegisub.org/pub/archives/releases/source/aegisub-${pkgver}.tar.xz;)
 sha256sums=('c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885')
 
+prepare() {
+  cd aegisub-${pkgver}
+
+  sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i 
tools/Makefile
+}
+
 build() {
   cd aegisub-${pkgver}
 


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2015-04-21 Thread Maxime Gauduin
Date: Tuesday, April 21, 2015 @ 11:41:50
  Author: alucryd
Revision: 131834

upgpkg: aegisub 3.2.2-3

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-21 09:31:31 UTC (rev 131833)
+++ PKGBUILD2015-04-21 09:41:50 UTC (rev 131834)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD aegisub-boost1.56.patch)

2015-04-04 Thread Maxime Gauduin
Date: Saturday, April 4, 2015 @ 11:53:27
  Author: alucryd
Revision: 130675

upgpkg: aegisub 3.2.2-2

Modified:
  aegisub/trunk/PKGBUILD
Deleted:
  aegisub/trunk/aegisub-boost1.56.patch

-+
 PKGBUILD|2 -
 aegisub-boost1.56.patch |   67 --
 2 files changed, 1 insertion(+), 68 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-04 09:43:20 UTC (rev 130674)
+++ PKGBUILD2015-04-04 09:53:27 UTC (rev 130675)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'

Deleted: aegisub-boost1.56.patch
===
--- aegisub-boost1.56.patch 2015-04-04 09:43:20 UTC (rev 130674)
+++ aegisub-boost1.56.patch 2015-04-04 09:53:27 UTC (rev 130675)
@@ -1,67 +0,0 @@
-diff --git a/libaegisub/include/libaegisub/lua/utils.h 
b/libaegisub/include/libaegisub/lua/utils.h
-index 4e907ee..634d924 100644
 a/libaegisub/include/libaegisub/lua/utils.h
-+++ b/libaegisub/include/libaegisub/lua/utils.h
-@@ -16,21 +16,27 @@
- 
- #include libaegisub/fs.h
- 
--#include boost/exception/detail/attribute_noreturn.hpp
- #include lua.hpp
- #include string
- #include vector
- #include type_traits
- 
-+#include boost/config.hpp
-+
-+#ifndef BOOST_NORETURN
-+#include boost/exception/detail/attribute_noreturn.hpp
-+#define BOOST_NORETURN BOOST_ATTRIBUTE_NORETURN
-+#endif
-+
- namespace agi { namespace lua {
- // Exception type for errors where the error details are on the lua stack
- struct error_tag {};
- 
- // Below are functionally equivalent to the luaL_ functions, but using a C++
- // exception for stack unwinding
--int BOOST_ATTRIBUTE_NORETURN error(lua_State *L, const char *fmt, ...);
--int BOOST_ATTRIBUTE_NORETURN argerror(lua_State *L, int narg, const char 
*extramsg);
--int BOOST_ATTRIBUTE_NORETURN typerror(lua_State *L, int narg, const char 
*tname);
-+int BOOST_NORETURN error(lua_State *L, const char *fmt, ...);
-+int BOOST_NORETURN argerror(lua_State *L, int narg, const char *extramsg);
-+int BOOST_NORETURN typerror(lua_State *L, int narg, const char *tname);
- void argcheck(lua_State *L, bool cond, int narg, const char *msg);
- 
- inline void push_value(lua_State *L, bool value) { lua_pushboolean(L, value); 
}
-diff --git a/libaegisub/lua/utils.cpp b/libaegisub/lua/utils.cpp
-index 8a5770e..9dd577b 100644
 a/libaegisub/lua/utils.cpp
-+++ b/libaegisub/lua/utils.cpp
-@@ -181,7 +181,7 @@ int add_stack_trace(lua_State *L) {
-   return 1;
- }
- 
--int BOOST_ATTRIBUTE_NORETURN error(lua_State *L, const char *fmt, ...) {
-+int BOOST_NORETURN error(lua_State *L, const char *fmt, ...) {
-   va_list argp;
-   va_start(argp, fmt);
-   luaL_where(L, 1);
-@@ -191,7 +191,7 @@ int BOOST_ATTRIBUTE_NORETURN error(lua_State *L, const 
char *fmt, ...) {
-   throw error_tag();
- }
- 
--int BOOST_ATTRIBUTE_NORETURN argerror(lua_State *L, int narg, const char 
*extramsg) {
-+int BOOST_NORETURN argerror(lua_State *L, int narg, const char *extramsg) {
-   lua_Debug ar;
-   if (!lua_getstack(L, 0, ar))
-   error(L, bad argument #%d (%s), narg, extramsg);
-@@ -203,7 +203,7 @@ int BOOST_ATTRIBUTE_NORETURN argerror(lua_State *L, int 
narg, const char *extram
-   narg, ar.name, extramsg);
- }
- 
--int BOOST_ATTRIBUTE_NORETURN typerror(lua_State *L, int narg, const char 
*tname) {
-+int BOOST_NORETURN typerror(lua_State *L, int narg, const char *tname) {
-   const char *msg = lua_pushfstring(L, %s expected, got %s,
-   tname, luaL_typename(L, narg));
-   argerror(L, narg, msg);


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2014-12-12 Thread Maxime Gauduin
Date: Friday, December 12, 2014 @ 10:20:23
  Author: alucryd
Revision: 123800

upgpkg: aegisub 3.2.2-1

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-12 03:23:11 UTC (rev 123799)
+++ PKGBUILD2014-12-12 09:20:23 UTC (rev 123800)
@@ -4,8 +4,8 @@
 # Contributor: Limao Luo luolimao+...@gmail.com
 
 pkgname=aegisub
-pkgver=3.2.1
-pkgrel=3
+pkgver=3.2.2
+pkgrel=1
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'
@@ -14,7 +14,7 @@
 makedepends=('boost' 'intltool' 'mesa')
 install='aegisub.install'
 
source=(http://ftp.aegisub.org/pub/archives/releases/source/aegisub-${pkgver}.tar.xz;)
-sha256sums=('961a28f2528a3c6330f06d0f2aef5fa71d93ca2ae1e6dcfabe347befbb6df8dc')
+sha256sums=('c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885')
 
 build() {
   cd aegisub-${pkgver}


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2014-11-04 Thread Maxime Gauduin
Date: Tuesday, November 4, 2014 @ 20:07:54
  Author: alucryd
Revision: 121879

boost rebuild: aegisub 3.2.1-3

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |   18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-04 18:58:41 UTC (rev 121878)
+++ PKGBUILD2014-11-04 19:07:54 UTC (rev 121879)
@@ -1,11 +1,11 @@
 # $Id$
-# Maintainer: Maxime Gauduin aluc...@gmail.com
+# Maintainer: Maxime Gauduin aluc...@archlinux.org
 # Contributor: kozec ko...@kozec.com
 # Contributor: Limao Luo luolimao+...@gmail.com
 
 pkgname=aegisub
 pkgver=3.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'
@@ -12,20 +12,22 @@
 license=('GPL' 'BSD')
 depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'wxgtk')
 makedepends=('boost' 'intltool' 'mesa')
-install=${pkgname}.install
-source=(http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz;)
+install='aegisub.install'
+source=(http://ftp.aegisub.org/pub/archives/releases/source/aegisub-${pkgver}.tar.xz;)
 sha256sums=('961a28f2528a3c6330f06d0f2aef5fa71d93ca2ae1e6dcfabe347befbb6df8dc')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd aegisub-${pkgver}
 
-  ./configure --prefix='/usr' --without-{portaudio,openal,oss} \
-  --disable-update-checker
+  ./configure \
+--prefix='/usr' \
+--without-{portaudio,openal,oss} \
+--disable-update-checker
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd aegisub-${pkgver}
 
   make DESTDIR=${pkgdir} install
 


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2014-10-17 Thread Jelle van der Waa
Date: Friday, October 17, 2014 @ 13:35:37
  Author: jelle
Revision: 120867

upgpkg: aegisub 3.2.1-2

icu 54.1 .so bump

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-17 11:22:16 UTC (rev 120866)
+++ PKGBUILD2014-10-17 11:35:37 UTC (rev 120867)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2014-09-17 Thread Maxime Gauduin
Date: Wednesday, September 17, 2014 @ 11:24:52
  Author: alucryd
Revision: 119084

upgpkg: aegisub 3.2.1-1

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |   16 
 1 file changed, 4 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-17 09:22:47 UTC (rev 119083)
+++ PKGBUILD2014-09-17 09:24:52 UTC (rev 119084)
@@ -4,8 +4,8 @@
 # Contributor: Limao Luo luolimao+...@gmail.com
 
 pkgname=aegisub
-pkgver=3.2.0
-pkgrel=3
+pkgver=3.2.1
+pkgrel=1
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'
@@ -13,17 +13,9 @@
 depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'wxgtk')
 makedepends=('boost' 'intltool' 'mesa')
 install=${pkgname}.install
-source=(http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz;
-'aegisub-boost1.56.patch')
-sha256sums=('d9e5fd48b243e29832361a13f8be82b271ef0c606b13593ec72461156ee19159'
-'998ffba66c5acd879c4bd87e339ee66cea875d37171a269ad5f29eedc2997ec0')
+source=(http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz;)
+sha256sums=('961a28f2528a3c6330f06d0f2aef5fa71d93ca2ae1e6dcfabe347befbb6df8dc')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  patch -Np1 -i ../aegisub-boost1.56.patch
-}
-
 build() {
   cd ${pkgname}-${pkgver}
 



[arch-commits] Commit in aegisub/trunk (PKGBUILD aegisub-boost1.56.patch)

2014-08-17 Thread Maxime Gauduin
Date: Sunday, August 17, 2014 @ 14:19:37
  Author: alucryd
Revision: 117474

boost rebuild: aegisub 3.2.0-3

Added:
  aegisub/trunk/aegisub-boost1.56.patch
Modified:
  aegisub/trunk/PKGBUILD

-+
 PKGBUILD|   14 +++--
 aegisub-boost1.56.patch |   67 ++
 2 files changed, 78 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-17 11:52:22 UTC (rev 117473)
+++ PKGBUILD2014-08-17 12:19:37 UTC (rev 117474)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'
@@ -13,9 +13,17 @@
 depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'wxgtk')
 makedepends=('boost' 'intltool' 'mesa')
 install=${pkgname}.install
-source=(http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz;)
-sha256sums=('d9e5fd48b243e29832361a13f8be82b271ef0c606b13593ec72461156ee19159')
+source=(http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz;
+'aegisub-boost1.56.patch')
+sha256sums=('d9e5fd48b243e29832361a13f8be82b271ef0c606b13593ec72461156ee19159'
+'998ffba66c5acd879c4bd87e339ee66cea875d37171a269ad5f29eedc2997ec0')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  patch -Np1 -i ../aegisub-boost1.56.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
 

Added: aegisub-boost1.56.patch
===
--- aegisub-boost1.56.patch (rev 0)
+++ aegisub-boost1.56.patch 2014-08-17 12:19:37 UTC (rev 117474)
@@ -0,0 +1,67 @@
+diff --git a/libaegisub/include/libaegisub/lua/utils.h 
b/libaegisub/include/libaegisub/lua/utils.h
+index 4e907ee..634d924 100644
+--- a/libaegisub/include/libaegisub/lua/utils.h
 b/libaegisub/include/libaegisub/lua/utils.h
+@@ -16,21 +16,27 @@
+ 
+ #include libaegisub/fs.h
+ 
+-#include boost/exception/detail/attribute_noreturn.hpp
+ #include lua.hpp
+ #include string
+ #include vector
+ #include type_traits
+ 
++#include boost/config.hpp
++
++#ifndef BOOST_NORETURN
++#include boost/exception/detail/attribute_noreturn.hpp
++#define BOOST_NORETURN BOOST_ATTRIBUTE_NORETURN
++#endif
++
+ namespace agi { namespace lua {
+ // Exception type for errors where the error details are on the lua stack
+ struct error_tag {};
+ 
+ // Below are functionally equivalent to the luaL_ functions, but using a C++
+ // exception for stack unwinding
+-int BOOST_ATTRIBUTE_NORETURN error(lua_State *L, const char *fmt, ...);
+-int BOOST_ATTRIBUTE_NORETURN argerror(lua_State *L, int narg, const char 
*extramsg);
+-int BOOST_ATTRIBUTE_NORETURN typerror(lua_State *L, int narg, const char 
*tname);
++int BOOST_NORETURN error(lua_State *L, const char *fmt, ...);
++int BOOST_NORETURN argerror(lua_State *L, int narg, const char *extramsg);
++int BOOST_NORETURN typerror(lua_State *L, int narg, const char *tname);
+ void argcheck(lua_State *L, bool cond, int narg, const char *msg);
+ 
+ inline void push_value(lua_State *L, bool value) { lua_pushboolean(L, value); 
}
+diff --git a/libaegisub/lua/utils.cpp b/libaegisub/lua/utils.cpp
+index 8a5770e..9dd577b 100644
+--- a/libaegisub/lua/utils.cpp
 b/libaegisub/lua/utils.cpp
+@@ -181,7 +181,7 @@ int add_stack_trace(lua_State *L) {
+   return 1;
+ }
+ 
+-int BOOST_ATTRIBUTE_NORETURN error(lua_State *L, const char *fmt, ...) {
++int BOOST_NORETURN error(lua_State *L, const char *fmt, ...) {
+   va_list argp;
+   va_start(argp, fmt);
+   luaL_where(L, 1);
+@@ -191,7 +191,7 @@ int BOOST_ATTRIBUTE_NORETURN error(lua_State *L, const 
char *fmt, ...) {
+   throw error_tag();
+ }
+ 
+-int BOOST_ATTRIBUTE_NORETURN argerror(lua_State *L, int narg, const char 
*extramsg) {
++int BOOST_NORETURN argerror(lua_State *L, int narg, const char *extramsg) {
+   lua_Debug ar;
+   if (!lua_getstack(L, 0, ar))
+   error(L, bad argument #%d (%s), narg, extramsg);
+@@ -203,7 +203,7 @@ int BOOST_ATTRIBUTE_NORETURN argerror(lua_State *L, int 
narg, const char *extram
+   narg, ar.name, extramsg);
+ }
+ 
+-int BOOST_ATTRIBUTE_NORETURN typerror(lua_State *L, int narg, const char 
*tname) {
++int BOOST_NORETURN typerror(lua_State *L, int narg, const char *tname) {
+   const char *msg = lua_pushfstring(L, %s expected, got %s,
+   tname, luaL_typename(L, narg));
+   argerror(L, narg, msg);


Property changes on: aegisub/trunk/aegisub-boost1.56.patch
___
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property


[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2014-08-08 Thread Maxime Gauduin
Date: Friday, August 8, 2014 @ 18:15:21
  Author: alucryd
Revision: 117042

wxgtk rebuild: aegisub 3.2.0-2

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-08 15:45:11 UTC (rev 117041)
+++ PKGBUILD2014-08-08 16:15:21 UTC (rev 117042)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'



[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2014-07-28 Thread Maxime Gauduin
Date: Monday, July 28, 2014 @ 18:44:37
  Author: alucryd
Revision: 116485

upgpkg: aegisub 3.2.0-1

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-28 16:31:40 UTC (rev 116484)
+++ PKGBUILD2014-07-28 16:44:37 UTC (rev 116485)
@@ -4,8 +4,8 @@
 # Contributor: Limao Luo luolimao+...@gmail.com
 
 pkgname=aegisub
-pkgver=3.1.3
-pkgrel=2
+pkgver=3.2.0
+pkgrel=1
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'
@@ -14,12 +14,13 @@
 makedepends=('boost' 'intltool' 'mesa')
 install=${pkgname}.install
 
source=(http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz;)
-sha256sums=('efea5bc2bc5e0651ada4f65cfdd8af1b422a15f87933710d11287bf51e2b5e58')
+sha256sums=('d9e5fd48b243e29832361a13f8be82b271ef0c606b13593ec72461156ee19159')
 
 build() {
   cd ${pkgname}-${pkgver}
 
-  ./configure --prefix='/usr' --without-{portaudio,openal,oss}
+  ./configure --prefix='/usr' --without-{portaudio,openal,oss} \
+  --disable-update-checker
   make
 }
 



[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2014-04-09 Thread Maxime Gauduin
Date: Wednesday, April 9, 2014 @ 11:40:09
  Author: alucryd
Revision: 108993

upgpkg: aegisub 3.1.3-2

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-09 08:54:27 UTC (rev 108992)
+++ PKGBUILD2014-04-09 09:40:09 UTC (rev 108993)
@@ -5,12 +5,12 @@
 
 pkgname=aegisub
 pkgver=3.1.3
-pkgrel=1
-pkgdesc=A general-purpose subtitle editor with ASS/SSA support
+pkgrel=2
+pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
-url=http://www.aegisub.org;
+url='http://www.aegisub.org'
 license=('GPL' 'BSD')
-depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'lua51' 
'wxgtk')
+depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'wxgtk')
 makedepends=('boost' 'intltool' 'mesa')
 install=${pkgname}.install
 
source=(http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz;)



[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2014-04-08 Thread Maxime Gauduin
Date: Wednesday, April 9, 2014 @ 00:37:21
  Author: alucryd
Revision: 108985

icu rebuild: aegisub 3.1.3-1

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-08 17:59:04 UTC (rev 108984)
+++ PKGBUILD2014-04-08 22:37:21 UTC (rev 108985)
@@ -4,7 +4,7 @@
 # Contributor: Limao Luo luolimao+...@gmail.com
 
 pkgname=aegisub
-pkgver=3.1.2
+pkgver=3.1.3
 pkgrel=1
 pkgdesc=A general-purpose subtitle editor with ASS/SSA support
 arch=('i686' 'x86_64')
@@ -14,10 +14,10 @@
 makedepends=('boost' 'intltool' 'mesa')
 install=${pkgname}.install
 
source=(http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz;)
-sha256sums=('36ebfd05cc642b050da1e91ce2d2082b317a37bdfab109e191f861170d7cff86')
+sha256sums=('efea5bc2bc5e0651ada4f65cfdd8af1b422a15f87933710d11287bf51e2b5e58')
 
 build() {
-  cd ${pkgname}-${pkgver}/${pkgname}
+  cd ${pkgname}-${pkgver}
 
   ./configure --prefix='/usr' --without-{portaudio,openal,oss}
   make
@@ -24,7 +24,7 @@
 }
 
 package() {
-  cd ${pkgname}-${pkgver}/${pkgname}
+  cd ${pkgname}-${pkgver}
 
   make DESTDIR=${pkgdir} install
 



[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2014-02-03 Thread Maxime Gauduin
Date: Monday, February 3, 2014 @ 11:40:26
  Author: alucryd
Revision: 105242

upgpkg: aegisub 3.1.2-1

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-03 10:20:19 UTC (rev 105241)
+++ PKGBUILD2014-02-03 10:40:26 UTC (rev 105242)
@@ -4,7 +4,7 @@
 # Contributor: Limao Luo luolimao+...@gmail.com
 
 pkgname=aegisub
-pkgver=3.1.1
+pkgver=3.1.2
 pkgrel=1
 pkgdesc=A general-purpose subtitle editor with ASS/SSA support
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
 makedepends=('boost' 'intltool' 'mesa')
 install=${pkgname}.install
 
source=(http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz;)
-sha256sums=('7f8417488cf56b835ddaa36e64916a64eb030fbd79d96a7f8009eae803e897ac')
+sha256sums=('36ebfd05cc642b050da1e91ce2d2082b317a37bdfab109e191f861170d7cff86')
 
 build() {
   cd ${pkgname}-${pkgver}/${pkgname}



[arch-commits] Commit in aegisub/trunk (PKGBUILD aegisub-wx-stl.patch)

2014-01-13 Thread Maxime Gauduin
Date: Monday, January 13, 2014 @ 22:33:48
  Author: alucryd
Revision: 103948

upgpkg: aegisub 3.1.1-1

Modified:
  aegisub/trunk/PKGBUILD
Deleted:
  aegisub/trunk/aegisub-wx-stl.patch

--+
 PKGBUILD |   16 +++-
 aegisub-wx-stl.patch |   61 -
 2 files changed, 4 insertions(+), 73 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-13 20:32:53 UTC (rev 103947)
+++ PKGBUILD2014-01-13 21:33:48 UTC (rev 103948)
@@ -4,8 +4,8 @@
 # Contributor: Limao Luo luolimao+...@gmail.com
 
 pkgname=aegisub
-pkgver=3.1.0
-pkgrel=2
+pkgver=3.1.1
+pkgrel=1
 pkgdesc=A general-purpose subtitle editor with ASS/SSA support
 arch=('i686' 'x86_64')
 url=http://www.aegisub.org;
@@ -13,17 +13,9 @@
 depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'lua51' 
'wxgtk')
 makedepends=('boost' 'intltool' 'mesa')
 install=${pkgname}.install
-source=(http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz;
-'aegisub-wx-stl.patch')
-sha256sums=('3df061456bbab6bd955d7c5b63336be47392eafa21148ff6ed5727eaa6a29987'
-'1306b2caf2e192597a99931b4519023ea63b684f330e0838b1152d52b279f6c1')
+source=(http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz;)
+sha256sums=('7f8417488cf56b835ddaa36e64916a64eb030fbd79d96a7f8009eae803e897ac')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  patch -Np1 -i ../aegisub-wx-stl.patch
-}
-
 build() {
   cd ${pkgname}-${pkgver}/${pkgname}
 

Deleted: aegisub-wx-stl.patch
===
--- aegisub-wx-stl.patch2014-01-13 20:32:53 UTC (rev 103947)
+++ aegisub-wx-stl.patch2014-01-13 21:33:48 UTC (rev 103948)
@@ -1,61 +0,0 @@
-From f71b380f016c7f2b7ec855a9945a4e62ad3e2e16 Mon Sep 17 00:00:00 2001
-From: Thomas Goyne plorkye...@aegisub.org
-Date: Sun, 5 Jan 2014 08:10:08 -0800
-Subject: [PATCH 1/4] Fix compilation with wx built with --enable-stl
-
---enable-stl replaces the implicit conversion to char/wchar_t* with one
-to std::[w]string. This breaks conversions to boost::filesytem::path and
-makes some ternaries ambiguous (which GCC helpfully reports as no
-conversion existing rather than an ambiguous conversion).

- aegisub/src/base_grid.cpp  | 6 +++---
- aegisub/src/command/video.cpp  | 2 +-
- aegisub/src/dialog_attachments.cpp | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp
-index 9422bf9..4675ad5 100644
 a/aegisub/src/base_grid.cpp
-+++ b/aegisub/src/base_grid.cpp
-@@ -570,9 +570,9 @@ void BaseGrid::GetRowStrings(int row, AssDialogue *line, 
bool *paint_columns, wx
-   if (paint_columns[4]) strings[4] = to_wx(line-Style);
-   if (paint_columns[5]) strings[5] = to_wx(line-Actor);
-   if (paint_columns[6]) strings[6] = to_wx(line-Effect);
--  if (paint_columns[7]) strings[7] = line-Margin[0] ? 
std::to_wstring(line-Margin[0]) : wxString();
--  if (paint_columns[8]) strings[8] = line-Margin[1] ? 
std::to_wstring(line-Margin[1]) : wxString();
--  if (paint_columns[9]) strings[9] = line-Margin[2] ? 
std::to_wstring(line-Margin[2]) : wxString();
-+  if (paint_columns[7]) strings[7] = line-Margin[0] ? 
wxString(std::to_wstring(line-Margin[0])) : wxString();
-+  if (paint_columns[8]) strings[8] = line-Margin[1] ? 
wxString(std::to_wstring(line-Margin[1])) : wxString();
-+  if (paint_columns[9]) strings[9] = line-Margin[2] ? 
wxString(std::to_wstring(line-Margin[2])) : wxString();
- 
-   if (paint_columns[10]) {
-   strings[10].clear();
-diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp
-index 010da90..47bf259 100644
 a/aegisub/src/command/video.cpp
-+++ b/aegisub/src/command/video.cpp
-@@ -476,7 +476,7 @@ static void save_snapshot(agi::Context *c, bool raw) {
-   // If where ever that is isn't defined, we can't save there
-   if ((basepath == \\) || (basepath == /)) {
-   // So save to the current user's home dir instead
--  basepath = wxGetHomeDir();
-+  basepath = wxGetHomeDir().c_str();
-   }
-   }
-   // Actual fixed (possibly relative) path, decode it
-diff --git a/aegisub/src/dialog_attachments.cpp 
b/aegisub/src/dialog_attachments.cpp
-index 5465b39..2ff696e 100644
 a/aegisub/src/dialog_attachments.cpp
-+++ b/aegisub/src/dialog_attachments.cpp
-@@ -150,7 +150,7 @@ void DialogAttachments::OnExtract(wxCommandEvent ) {
- 
-   // Multiple or single?
-   if (listView-GetNextSelected(i) != -1)
--  path = wxDirSelector(_(Select the path to save the files 
to:), to_wx(OPT_GET(Path/Fonts Collector Destination)-GetString()));
-+  path = wxDirSelector(_(Select the path to save the files 
to:), 

[arch-commits] Commit in aegisub/trunk (PKGBUILD aegisub-wx-stl.patch version.patch)

2014-01-09 Thread Maxime Gauduin
Date: Thursday, January 9, 2014 @ 10:26:44
  Author: alucryd
Revision: 103672

upgpkg: aegisub 3.1.0-2

Added:
  aegisub/trunk/aegisub-wx-stl.patch
Modified:
  aegisub/trunk/PKGBUILD
Deleted:
  aegisub/trunk/version.patch

--+
 PKGBUILD |   17 +++---
 aegisub-wx-stl.patch |   61 +++
 version.patch|   76 -
 3 files changed, 72 insertions(+), 82 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-09 06:33:11 UTC (rev 103671)
+++ PKGBUILD2014-01-09 09:26:44 UTC (rev 103672)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc=A general-purpose subtitle editor with ASS/SSA support
 arch=('i686' 'x86_64')
 url=http://www.aegisub.org;
@@ -14,23 +14,28 @@
 makedepends=('boost' 'intltool' 'mesa')
 install=${pkgname}.install
 source=(http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz;
-'version.patch')
-sha256sums=('0d2befed013f3c64ab2cdf725f2b865fe2d074b35b621b7a61298b95f67def15'
-'4119b79363512b18c6ddcbbdfb87b35c51e0ea149e763b126f568e80f956a01f')
+'aegisub-wx-stl.patch')
+sha256sums=('3df061456bbab6bd955d7c5b63336be47392eafa21148ff6ed5727eaa6a29987'
+'1306b2caf2e192597a99931b4519023ea63b684f330e0838b1152d52b279f6c1')
 
 prepare() {
-  patch -Np1 -i version.patch
+  cd ${pkgname}-${pkgver}
+
+  patch -Np1 -i ../aegisub-wx-stl.patch
 }
 
 build() {
+  cd ${pkgname}-${pkgver}/${pkgname}
+
   ./configure --prefix='/usr' --without-{portaudio,openal,oss}
   make
 }
 
 package() {
+  cd ${pkgname}-${pkgver}/${pkgname}
+
   make DESTDIR=${pkgdir} install
 
-# License
   install -dm 755 ${pkgdir}/usr/share/licenses/aegisub
   install -m 644 LICENCE ${pkgdir}/usr/share/licenses/aegisub/LICENSE
 }

Added: aegisub-wx-stl.patch
===
--- aegisub-wx-stl.patch(rev 0)
+++ aegisub-wx-stl.patch2014-01-09 09:26:44 UTC (rev 103672)
@@ -0,0 +1,61 @@
+From f71b380f016c7f2b7ec855a9945a4e62ad3e2e16 Mon Sep 17 00:00:00 2001
+From: Thomas Goyne plorkye...@aegisub.org
+Date: Sun, 5 Jan 2014 08:10:08 -0800
+Subject: [PATCH 1/4] Fix compilation with wx built with --enable-stl
+
+--enable-stl replaces the implicit conversion to char/wchar_t* with one
+to std::[w]string. This breaks conversions to boost::filesytem::path and
+makes some ternaries ambiguous (which GCC helpfully reports as no
+conversion existing rather than an ambiguous conversion).
+---
+ aegisub/src/base_grid.cpp  | 6 +++---
+ aegisub/src/command/video.cpp  | 2 +-
+ aegisub/src/dialog_attachments.cpp | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp
+index 9422bf9..4675ad5 100644
+--- a/aegisub/src/base_grid.cpp
 b/aegisub/src/base_grid.cpp
+@@ -570,9 +570,9 @@ void BaseGrid::GetRowStrings(int row, AssDialogue *line, 
bool *paint_columns, wx
+   if (paint_columns[4]) strings[4] = to_wx(line-Style);
+   if (paint_columns[5]) strings[5] = to_wx(line-Actor);
+   if (paint_columns[6]) strings[6] = to_wx(line-Effect);
+-  if (paint_columns[7]) strings[7] = line-Margin[0] ? 
std::to_wstring(line-Margin[0]) : wxString();
+-  if (paint_columns[8]) strings[8] = line-Margin[1] ? 
std::to_wstring(line-Margin[1]) : wxString();
+-  if (paint_columns[9]) strings[9] = line-Margin[2] ? 
std::to_wstring(line-Margin[2]) : wxString();
++  if (paint_columns[7]) strings[7] = line-Margin[0] ? 
wxString(std::to_wstring(line-Margin[0])) : wxString();
++  if (paint_columns[8]) strings[8] = line-Margin[1] ? 
wxString(std::to_wstring(line-Margin[1])) : wxString();
++  if (paint_columns[9]) strings[9] = line-Margin[2] ? 
wxString(std::to_wstring(line-Margin[2])) : wxString();
+ 
+   if (paint_columns[10]) {
+   strings[10].clear();
+diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp
+index 010da90..47bf259 100644
+--- a/aegisub/src/command/video.cpp
 b/aegisub/src/command/video.cpp
+@@ -476,7 +476,7 @@ static void save_snapshot(agi::Context *c, bool raw) {
+   // If where ever that is isn't defined, we can't save there
+   if ((basepath == \\) || (basepath == /)) {
+   // So save to the current user's home dir instead
+-  basepath = wxGetHomeDir();
++  basepath = wxGetHomeDir().c_str();
+   }
+   }
+   // Actual fixed (possibly relative) path, decode it
+diff --git a/aegisub/src/dialog_attachments.cpp 
b/aegisub/src/dialog_attachments.cpp
+index 5465b39..2ff696e 100644
+--- a/aegisub/src/dialog_attachments.cpp
 b/aegisub/src/dialog_attachments.cpp
+@@ -150,7 +150,7 @@ void DialogAttachments::OnExtract(wxCommandEvent ) {
+ 
+   // Multiple or 

[arch-commits] Commit in aegisub/trunk (PKGBUILD version.patch)

2014-01-05 Thread Maxime Gauduin
Date: Sunday, January 5, 2014 @ 19:08:07
  Author: alucryd
Revision: 103401

wxGTK rebuild: aegisub 3.1.0-1

Added:
  aegisub/trunk/version.patch
Modified:
  aegisub/trunk/PKGBUILD

---+
 PKGBUILD  |   24 ++---
 version.patch |   76 
 2 files changed, 85 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-05 17:43:52 UTC (rev 103400)
+++ PKGBUILD2014-01-05 18:08:07 UTC (rev 103401)
@@ -4,36 +4,30 @@
 # Contributor: Limao Luo luolimao+...@gmail.com
 
 pkgname=aegisub
-pkgver=3.0.4
-pkgrel=5
+pkgver=3.1.0
+pkgrel=1
 pkgdesc=A general-purpose subtitle editor with ASS/SSA support
 arch=('i686' 'x86_64')
 url=http://www.aegisub.org;
 license=('GPL' 'BSD')
-depends=('desktop-file-utils' 'ffms2' 'fftw' 'hicolor-icon-theme' 'hunspell' 
'lua51' 'wxgtk2.9')
-makedepends=('mesa')
+depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'lua51' 
'wxgtk')
+makedepends=('boost' 'intltool' 'mesa')
 install=${pkgname}.install
 source=(http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz;
-'wxgtk2.9.5.patch')
-sha256sums=('7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a'
-'8aed8aaf4773e4a315f9336d3ea4af2c46b9e84c4e651c202e0a70a6cd9e499c')
+'version.patch')
+sha256sums=('0d2befed013f3c64ab2cdf725f2b865fe2d074b35b621b7a61298b95f67def15'
+'4119b79363512b18c6ddcbbdfb87b35c51e0ea149e763b126f568e80f956a01f')
 
 prepare() {
-  cd ${pkgname}/${pkgname}
-
-  patch -Np2 -i ../../wxgtk2.9.5.patch
+  patch -Np1 -i version.patch
 }
 
 build() {
-  cd ${pkgname}/${pkgname}
-
-  ./configure --prefix='/usr' --without-{portaudio,openal,oss} 
--with-wxdir='/usr/include/wx-2.9' --with-wx-config='/usr/bin/wx-config-2.9'
+  ./configure --prefix='/usr' --without-{portaudio,openal,oss}
   make
 }
 
 package() {
-  cd ${pkgname}/${pkgname}
-
   make DESTDIR=${pkgdir} install
 
 # License

Added: version.patch
===
--- version.patch   (rev 0)
+++ version.patch   2014-01-05 18:08:07 UTC (rev 103401)
@@ -0,0 +1,76 @@
+--- a/build/version.sh 2014-01-04 15:24:06.0 +0100
 b/build/version.sh 2014-01-04 18:34:30.596106160 +0100
+@@ -1,70 +1,3 @@
+-srcdir=$1
+-
+-# If no git repo try to read from the existing git_version.h, for building 
from tarballs
+-if ! test -d ${srcdir}/.git; then
+-  version_h_path=${srcdir}/aegisub/build/git_version.h
+-  if test -f ${version_h_path}; then
+-while read line; do
+-  set -- $line
+-  export $2=$(echo $3 | sed 's///g')
+-done  ${version_h_path}
+-if test x$BUILD_GIT_VERSION_NUMBER != x -a x$BUILD_GIT_VERSION_STRING != 
x; then
+-  export VERSION_SOURCE=from cached git_version.h
+-  return 0
+-else
+-  echo invalid git_version.h
+-  exit 2
+-fi
+-  else
+-echo git repo not found and no cached git_version.h
+-exit 2
+-  fi
+-fi
+-
+-last_svn_revision=6962
+-last_svn_hash=16cd907fe7482cb54a7374cd28b8501f138116be
+-
+-git_revision=$(expr $last_svn_revision + $(git log --pretty=oneline 
$last_svn_hash..HEAD 2/dev/null | wc -l))
+-git_version_str=$(git describe --exact-match 2 /dev/null)
+-if test x$git_version_str != x; then
+-  git_version_str=${git_version_str##v}
+-  tagged_release=1
+-else
+-  git_branch=$(git symbolic-ref HEAD 2 /dev/null) || git_branch=(unnamed 
branch)
+-  git_branch=${git_branch##refs/heads/}
+-  git_hash=$(git rev-parse --short HEAD)
+-
+-  git_version_str=${git_revision}-${git_branch}-${git_hash}
+-  tagged_release=0
+-fi
+-
+-new_version_h=\
+-#define BUILD_GIT_VERSION_NUMBER ${git_revision}
+-#define BUILD_GIT_VERSION_STRING \${git_version_str}\
+-#define TAGGED_RELEASE ${tagged_release}
+-
+-# may not exist yet for out of tree builds
+-mkdir -p build
+-version_h_path=build/git_version.h
+-
+-# Write it only if it's changed to avoid spurious rebuilds
+-# This bizzare comparison method is due to that newlines in shell variables 
are very exciting
+-case $(cat ${version_h_path} 2 /dev/null)
+-in
+-  ${new_version_h});;
+-  *) echo ${new_version_h}  ${version_h_path}
+-esac
+-
+-export BUILD_GIT_VERSION_NUMBER=${git_revision}
+-export BUILD_GIT_VERSION_STRING=${git_version_str}
+-export VERSION_SOURCE=from git
+-
+-cat  EOF  build/git_version.xml
+-?xml version=1.0 encoding=utf-8?
+-Project ToolsVersion=4.0 
xmlns=http://schemas.microsoft.com/developer/msbuild/2003;
+-  PropertyGroup
+-GitVersionNumber${git_revision}/GitVersionNumber
+-GitVersionString${git_version_str}/GitVersionString
+-  /PropertyGroup
+-/Project
+-EOF
++export BUILD_GIT_VERSION_NUMBER='7937'
++export BUILD_GIT_VERSION_STRING='3.1.0'
++export TAGGED_RELEASE=1



[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2013-10-25 Thread Giovanni Scafora
Date: Friday, October 25, 2013 @ 14:58:10
  Author: giovanni
Revision: 99198

upgpkg: aegisub 3.0.4-5

libass.so.5 bump

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-25 12:45:06 UTC (rev 99197)
+++ PKGBUILD2013-10-25 12:58:10 UTC (rev 99198)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.0.4
-pkgrel=4
+pkgrel=5
 pkgdesc=A general-purpose subtitle editor with ASS/SSA support
 arch=('i686' 'x86_64')
 url=http://www.aegisub.org;



[arch-commits] Commit in aegisub/trunk (PKGBUILD wxgtk2.9.5.patch)

2013-09-02 Thread Maxime Gauduin
Date: Monday, September 2, 2013 @ 10:35:25
  Author: alucryd
Revision: 96597

FS#36641: aegisub 3.0.4-3

Modified:
  aegisub/trunk/PKGBUILD
  aegisub/trunk/wxgtk2.9.5.patch

--+
 PKGBUILD |8 
 wxgtk2.9.5.patch |   33 +++--
 2 files changed, 23 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-02 07:16:12 UTC (rev 96596)
+++ PKGBUILD2013-09-02 08:35:25 UTC (rev 96597)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc=A general-purpose subtitle editor with ASS/SSA support
 arch=('i686' 'x86_64')
 url=http://www.aegisub.org;
@@ -12,11 +12,11 @@
 license=('GPL' 'BSD')
 depends=('desktop-file-utils' 'ffmpegsource' 'fftw' 'hicolor-icon-theme' 
'hunspell' 'lua51' 'wxgtk2.9')
 makedepends=('mesa')
-install=aegisub.install
+install=${pkgname}.install
 source=(http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz;
 'wxgtk2.9.5.patch')
 sha256sums=('7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a'
-'b3dc9f094d23e6f38a7a03dc3692056bd9e09095dab8385d7f2fd7c0e73e19d2')
+'8aed8aaf4773e4a315f9336d3ea4af2c46b9e84c4e651c202e0a70a6cd9e499c')
 
 prepare() {
   cd ${pkgname}/${pkgname}
@@ -29,7 +29,7 @@
 
   export ACLOCAL=aclocal
   export AUTOMAKE=automake
-  ./autogen.sh --prefix=/usr --without-{portaudio,openal,oss} 
--with-wxdir=/usr/include/wx-2.9 --with-wx-config=/usr/bin/wx-config-2.9
+  ./autogen.sh --prefix='/usr' --without-{portaudio,openal,oss} 
--with-wxdir='/usr/include/wx-2.9' --with-wx-config='/usr/bin/wx-config-2.9'
   make
 }
 

Modified: wxgtk2.9.5.patch
===
--- wxgtk2.9.5.patch2013-09-02 07:16:12 UTC (rev 96596)
+++ wxgtk2.9.5.patch2013-09-02 08:35:25 UTC (rev 96597)
@@ -1,14 +1,3 @@
-From ca8036d425bf59020b476259e7857e8c67ebb6ba Mon Sep 17 00:00:00 2001
-From: Maxime Gauduin aluc...@gmail.com
-Date: Mon, 12 Aug 2013 05:20:41 +0200
-Subject: [PATCH] wxStandardPaths is protected as of wxgtk 2.9.5
-

- aegisub/src/utils.cpp | 6 ++
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/aegisub/src/utils.cpp b/aegisub/src/utils.cpp
-index 70c9ea1..f72593d 100644
 --- a/aegisub/src/utils.cpp
 +++ b/aegisub/src/utils.cpp
 @@ -121,8 +121,7 @@ void RestartAegisub() {
@@ -31,6 +20,22 @@
  #endif
  }
  
--- 
-1.8.3.4
-
+--- a/aegisub/src/menu.cpp
 b/aegisub/src/menu.cpp
+@@ -457,11 +457,11 @@ namespace menu {
+   window-Bind(wxEVT_COMMAND_MENU_SELECTED, 
CommandManager::OnMenuClick, menu-cm);
+   window-SetMenuBar(menu.get());
+ 
+-#ifdef __WXGTK__
+-  // GTK silently swallows keypresses for accelerators whose 
associated
+-  // menu items are disabled. As we don't update the menu until 
it's
+-  // opened, this means that conditional hotkeys don't work if 
the menu
+-  // hasn't been opened since they became valid.
++#if defined(__WXGTK__)  !wxCHECK_VERSION(2, 9, 5)
++  // Older versions of wxGTK silently swallow keypresses for 
accelerators
++  // whose associated menu items are disabled. As we don't update 
the
++  // menu until it's opened, this means that conditional hotkeys 
don't
++  // work if the menu hasn't been opened since they became valid.
+   //
+   // To work around this, we completely disable accelerators from 
menu
+   // item. wxGTK doesn't expose any way to do this other that at 
wx



[arch-commits] Commit in aegisub/trunk (PKGBUILD wxgtk2.9.5.patch)

2013-08-16 Thread Maxime Gauduin
Date: Friday, August 16, 2013 @ 19:02:42
  Author: alucryd
Revision: 95768

wxgtk2.9 2.9.5 rebuild: aegisub 3.0.4-2

Added:
  aegisub/trunk/wxgtk2.9.5.patch
Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |   26 ++
 wxgtk2.9.5.patch |   36 
 2 files changed, 54 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-16 16:52:55 UTC (rev 95767)
+++ PKGBUILD2013-08-16 17:02:42 UTC (rev 95768)
@@ -5,28 +5,38 @@
 
 pkgname=aegisub
 pkgver=3.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc=A general-purpose subtitle editor with ASS/SSA support
 arch=('i686' 'x86_64')
 url=http://www.aegisub.org;
 license=('GPL' 'BSD')
-depends=('desktop-file-utils' 'ffmpegsource' 'fftw' 'hicolor-icon-theme' 
'hunspell' 'lua51' 'wxgtk2.9' 'hicolor-icon-theme')
+depends=('desktop-file-utils' 'ffmpegsource' 'fftw' 'hicolor-icon-theme' 
'hunspell' 'lua51' 'wxgtk2.9')
 makedepends=('mesa')
 install=aegisub.install
-source=(http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz;)
-sha256sums=('7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a')
+source=(http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz;
+'wxgtk2.9.5.patch')
+sha256sums=('7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a'
+'b3dc9f094d23e6f38a7a03dc3692056bd9e09095dab8385d7f2fd7c0e73e19d2')
 
+prepare() {
+  cd ${pkgname}/${pkgname}
+
+  patch -Np2 -i ../../wxgtk2.9.5.patch
+}
+
 build() {
-  cd ${srcdir}/${pkgname}/${pkgname}
+  cd ${pkgname}/${pkgname}
 
-  ACLOCAL=aclocal AUTOMAKE=automake ./autogen.sh --prefix=/usr 
--without-{portaudio,openal,oss} --with-wxdir=/usr/include/wx-2.9 
--with-wx-config=/usr/bin/wx-config-2.9
+  export ACLOCAL=aclocal
+  export AUTOMAKE=automake
+  ./autogen.sh --prefix=/usr --without-{portaudio,openal,oss} 
--with-wxdir=/usr/include/wx-2.9 --with-wx-config=/usr/bin/wx-config-2.9
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}/${pkgname}
+  cd ${pkgname}/${pkgname}
 
-  make DESTDIR=$pkgdir install
+  make DESTDIR=${pkgdir} install
 
 # License
   install -dm 755 ${pkgdir}/usr/share/licenses/aegisub

Added: wxgtk2.9.5.patch
===
--- wxgtk2.9.5.patch(rev 0)
+++ wxgtk2.9.5.patch2013-08-16 17:02:42 UTC (rev 95768)
@@ -0,0 +1,36 @@
+From ca8036d425bf59020b476259e7857e8c67ebb6ba Mon Sep 17 00:00:00 2001
+From: Maxime Gauduin aluc...@gmail.com
+Date: Mon, 12 Aug 2013 05:20:41 +0200
+Subject: [PATCH] wxStandardPaths is protected as of wxgtk 2.9.5
+
+---
+ aegisub/src/utils.cpp | 6 ++
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/aegisub/src/utils.cpp b/aegisub/src/utils.cpp
+index 70c9ea1..f72593d 100644
+--- a/aegisub/src/utils.cpp
 b/aegisub/src/utils.cpp
+@@ -121,8 +121,7 @@ void RestartAegisub() {
+   config::opt-Flush();
+ 
+ #if defined(__WXMSW__)
+-  wxStandardPaths stand;
+-  wxExecute(\ + stand.GetExecutablePath() + \);
++  wxExecute(\ + wxStandardPaths::Get().GetExecutablePath() + \);
+ #elif defined(__WXMAC__)
+   std::string bundle_path = agi::util::OSX_GetBundlePath();
+   std::string helper_path = 
agi::util::OSX_GetBundleAuxillaryExecutablePath(restart-helper);
+@@ -132,8 +131,7 @@ void RestartAegisub() {
+   LOG_I(util/restart/exec)  exec;
+   wxExecute(exec);
+ #else
+-  wxStandardPaths stand;
+-  wxExecute(stand.GetExecutablePath());
++  wxExecute(wxStandardPaths::Get().GetExecutablePath());
+ #endif
+ }
+ 
+-- 
+1.8.3.4
+



[arch-commits] Commit in aegisub/trunk (PKGBUILD)

2013-07-11 Thread Maxime Gauduin
Date: Thursday, July 11, 2013 @ 18:18:21
  Author: alucryd
Revision: 93875

upgpkg: aegisub 3.0.4-1

Modified:
  aegisub/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-11 16:16:39 UTC (rev 93874)
+++ PKGBUILD2013-07-11 16:18:21 UTC (rev 93875)
@@ -4,7 +4,7 @@
 # Contributor: Limao Luo luolimao+...@gmail.com
 
 pkgname=aegisub
-pkgver=3.0.3
+pkgver=3.0.4
 pkgrel=1
 pkgdesc=A general-purpose subtitle editor with ASS/SSA support
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
 makedepends=('mesa')
 install=aegisub.install
 source=(http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz;)
-sha256sums=('9623e1967ae774d8a34fae531dcf76f15ae060f864cf941d34ba3d64e1986efc')
+sha256sums=('7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a')
 
 build() {
   cd ${srcdir}/${pkgname}/${pkgname}



[arch-commits] Commit in aegisub/trunk (PKGBUILD crash-on-deatach.patch lua51.patch)

2013-06-30 Thread Maxime Gauduin
Date: Sunday, June 30, 2013 @ 21:00:50
  Author: alucryd
Revision: 93264

upgpkg: aegisub 3.0.3-1

Modified:
  aegisub/trunk/PKGBUILD
Deleted:
  aegisub/trunk/crash-on-deatach.patch
  aegisub/trunk/lua51.patch

+
 PKGBUILD   |   19 +--
 crash-on-deatach.patch |   10 --
 lua51.patch|   24 
 3 files changed, 5 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-30 14:06:34 UTC (rev 93263)
+++ PKGBUILD2013-06-30 19:00:50 UTC (rev 93264)
@@ -4,8 +4,8 @@
 # Contributor: Limao Luo luolimao+...@gmail.com
 
 pkgname=aegisub
-pkgver=3.0.2
-pkgrel=6
+pkgver=3.0.3
+pkgrel=1
 pkgdesc=A general-purpose subtitle editor with ASS/SSA support
 arch=('i686' 'x86_64')
 url=http://www.aegisub.org;
@@ -13,28 +13,19 @@
 depends=('desktop-file-utils' 'ffmpegsource' 'fftw' 'hicolor-icon-theme' 
'hunspell' 'lua51' 'wxgtk2.9' 'hicolor-icon-theme')
 makedepends=('mesa')
 install=aegisub.install
-source=(http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz; 
'crash-on-deatach.patch' 'lua51.patch')
-sha256sums=('68ec20cf49f513608cec400bd462ebb762d6057109968fb01d842e10e6e7fb39'
-'85e2c2a6bf091f5b4ca29a0149df8d8ca6219d98a4095f79809f2e698983bca4'
-'ce67b143cc2949fbbd7d72862c54005030339d1c364753335acec271ca9e179d')
+source=(http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz;)
+sha256sums=('9623e1967ae774d8a34fae531dcf76f15ae060f864cf941d34ba3d64e1986efc')
 
 build() {
   cd ${srcdir}/${pkgname}/${pkgname}
 
-# Patch
-  patch -Np1 -i ${srcdir}/crash-on-deatach.patch
-  patch -Np1 -i ${srcdir}/lua51.patch
-
-# Build
-  autoreconf -ivf
-  ./configure --prefix=/usr --without-{portaudio,openal,oss} 
--with-wxdir=/usr/include/wx-2.9 --with-wx-config=/usr/bin/wx-config-2.9
+  ACLOCAL=aclocal AUTOMAKE=automake ./autogen.sh --prefix=/usr 
--without-{portaudio,openal,oss} --with-wxdir=/usr/include/wx-2.9 
--with-wx-config=/usr/bin/wx-config-2.9
   make
 }
 
 package() {
   cd ${srcdir}/${pkgname}/${pkgname}
 
-# Install
   make DESTDIR=$pkgdir install
 
 # License

Deleted: crash-on-deatach.patch
===
--- crash-on-deatach.patch  2013-06-30 14:06:34 UTC (rev 93263)
+++ crash-on-deatach.patch  2013-06-30 19:00:50 UTC (rev 93264)
@@ -1,10 +0,0 @@
 a/src/video_display.cpp
-+++ b/src/video_display.cpp
-@@ -309,6 +309,7 @@
- }
- 
- void VideoDisplay::UpdateSize() {
-+  if (zoomValue=0) zoomValue = 1;
-   if (!con-videoController-IsLoaded() || !IsShownOnScreen()) return;
- 
-   videoSize.Set(con-videoController-GetWidth(), 
con-videoController-GetHeight());

Deleted: lua51.patch
===
--- lua51.patch 2013-06-30 14:06:34 UTC (rev 93263)
+++ lua51.patch 2013-06-30 19:00:50 UTC (rev 93264)
@@ -1,24 +0,0 @@
 a/configure.ac
-+++ b/configure.ac
-@@ -371,9 +371,9 @@
- 
- AS_IF([test x$with_lua = xno], [$with_auto4_lua=no; 
lua_disabled=(disabled)], [
-   # First try pkg-config with several names
--  PKG_CHECK_MODULES(LUA, lua = 5.1, [with_auto4_lua=yes], [
--  PKG_CHECK_MODULES(LUA, lua5.1  = 5.1, [with_auto4_lua=yes], [
--  PKG_CHECK_MODULES(LUA, lua-5.1 = 5.1, [with_auto4_lua=yes], [
-+  PKG_CHECK_MODULES(LUA, lua5.1  = 5.1 lua5.1   5.2, 
[with_auto4_lua=yes], [
-+  PKG_CHECK_MODULES(LUA, lua-5.1 = 5.1 lua-5.1  5.2, 
[with_auto4_lua=yes], [
-+  PKG_CHECK_MODULES(LUA, lua = 5.1 lua  5.2, 
[with_auto4_lua=yes], [
- # Still not found so try to autodetect
- AS_IF([test -z $LUA_CFLAGS],
-   [AGI_FIND_HEADER([LUA], [lua.hpp],
-@@ -393,7 +393,7 @@
-   return !res;
- }])
- AS_IF([test x$agi_cv_with_lua = xno  test x$with_lua = xyes],
--  [AC_MSG_FAILURE([--with-lua was specified, but lua could not be 
found. Try setting LUA_CLFAGS and LUA_LIBS manually])])
-+  [AC_MSG_FAILURE([--with-lua was specified, but lua 5.1 could not be 
found. Try setting LUA_CLFAGS and LUA_LIBS manually])])
- with_auto4_lua=$agi_cv_with_lua
-   ])])])
- ])



[arch-commits] Commit in aegisub/trunk (PKGBUILD aegisub.install)

2013-02-28 Thread Maxime Gauduin
Date: Friday, March 1, 2013 @ 01:31:57
  Author: alucryd
Revision: 85316

upgpkg: aegisub 3.0.2-6

Modified:
  aegisub/trunk/PKGBUILD
  aegisub/trunk/aegisub.install

-+
 PKGBUILD|4 +++-
 aegisub.install |2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-01 00:25:38 UTC (rev 85315)
+++ PKGBUILD2013-03-01 00:31:57 UTC (rev 85316)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.0.2
-pkgrel=5
+pkgrel=6
 pkgdesc=A general-purpose subtitle editor with ASS/SSA support
 arch=('i686' 'x86_64')
 url=http://www.aegisub.org;
@@ -41,3 +41,5 @@
   install -dm 755 ${pkgdir}/usr/share/licenses/aegisub
   install -m 644 LICENCE ${pkgdir}/usr/share/licenses/aegisub/LICENSE
 }
+
+# vim: ts=2 sw=2 et:

Modified: aegisub.install
===
--- aegisub.install 2013-03-01 00:25:38 UTC (rev 85315)
+++ aegisub.install 2013-03-01 00:31:57 UTC (rev 85316)
@@ -1,5 +1,5 @@
 post_install() {
-gtk-update-icon-cache -ftq /usr/share/icons/hicolor
+gtk-update-icon-cache -ftq usr/share/icons/hicolor
 update-desktop-database -q
 }