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

[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
===================================================================
--- PKGBUILD	2014-01-05 17:43:52 UTC (rev 103400)
+++ PKGBUILD	2014-01-05 18:08:07 UTC (rev 103401)
@@ -4,36 +4,30 @@
 # Contributor: Limao Luo <luolimao+AUR at 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.000000000 +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