Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ca322dabc192108a6030eb77622467a7d37ca3f5

commit ca322dabc192108a6030eb77622467a7d37ca3f5
Author: kikadf <[email protected]>
Date:   Mon Jan 6 09:45:07 2014 +0100

aegisub-3.1.0-1-x86_64

* Version bump

diff --git a/source/xapps-extra/aegisub/FrugalBuild 
b/source/xapps-extra/aegisub/FrugalBuild
index b1b9075..555420b 100644
--- a/source/xapps-extra/aegisub/FrugalBuild
+++ b/source/xapps-extra/aegisub/FrugalBuild
@@ -4,21 +4,20 @@
options+=('asneeded')

pkgname=aegisub
-pkgver=3.0.4
-pkgrel=3
+pkgver=3.1.0
+pkgrel=1
pkgdesc="Aegisub is a cross-platform subtitle editor."
url="http://www.aegisub.org/";
-depends=('hunspell' 'libass' 'portaudio' 'libpulse>=2.1' 'intltool' \
-         'ffmpegsource>=2.17-3' 'wxwidget>=3.0.0' 'x264>=20120904')
-_F_cd_path="$pkgname/$pkgname"
+depends=('hunspell' 'libass' 'portaudio' 'libpulse>=2.1' 'intltool' 'libgl'\
+         'ffmpegsource>=2.17-3' 'wxwidget>=3.0.0' 'x264>=20120904' 'libboost')
+makedepends=('boost>=1.50.0')
+_F_cd_path="$pkgname-$pkgver/$pkgname"
Fconfopts+=" --with-wx-config=/usr/lib/wx/config/gtk2-unicode-3.0 
--without-openal"
groups=('xapps-extra')
archs=('i686' 'x86_64')
up2date="Flasttar http://ftp.aegisub.org/pub/releases/";
-source=(http://ftp.aegisub.org/pub/releases/$pkgname-$pkgver.tar.xz \
-        wxwidget-3.0.0.patch)
-sha1sums=('6922e2084ce0a2dfebd2ac886a851f9feed6bd91' \
-          '7faadbcd727fbf13988feaff7b2b9742cab8e202')
+source=(http://ftp.aegisub.org/pub/releases/$pkgname-$pkgver.tar.xz)
+sha1sums=('6e0284f76b93f5a53a02ecd45d3b696b0633fc17')


build()
diff --git a/source/xapps-extra/aegisub/wxwidget-3.0.0.patch 
b/source/xapps-extra/aegisub/wxwidget-3.0.0.patch
deleted file mode 100644
index 0506e99..0000000
--- a/source/xapps-extra/aegisub/wxwidget-3.0.0.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naur aegisub/aegisub/src/menu.cpp aegisub.new/aegisub/src/menu.cpp
---- aegisub/src/menu.cpp       2013-07-04 20:05:39.000000000 +0200
-+++ aegisub.new/src/menu.cpp   2013-11-06 17:02:30.254248453 +0100
-@@ -462,11 +462,11 @@
-               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(3, 0, 0)
-+              // 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
-diff -Naur aegisub/aegisub/src/utils.cpp aegisub.new/aegisub/src/utils.cpp
---- aegisub/src/utils.cpp      2013-07-04 20:05:39.000000000 +0200
-+++ aegisub.new/src/utils.cpp  2013-11-06 17:01:30.614247354 +0100
-@@ -279,8 +279,7 @@
-       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");
-@@ -290,8 +289,7 @@
-       LOG_I("util/restart/exec") << exec;
-       wxExecute(exec);
- #else
--      wxStandardPaths stand;
--      wxExecute(stand.GetExecutablePath());
-+      wxExecute(wxStandardPaths::Get().GetExecutablePath());
- #endif
- }
-
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to