summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfenuks2017-04-17 22:07:17 +0200
committerfenuks2017-04-17 22:07:17 +0200
commit469387b4b3826ff71a1f2e78bca0fce12a031081 (patch)
tree52df38c8e0a18247020900c02eeb5e4acb5e179e
parent73d4337c921b792376b3bba93db83d2635535baa (diff)
downloadaur-469387b4b3826ff71a1f2e78bca0fce12a031081.tar.gz
Update PKGBUILD, remove patch
-rw-r--r--.SRCINFO11
-rwxr-xr-xPKGBUILD21
-rw-r--r--ultrastardxwp-git.install3
-rw-r--r--ultrastardxwp.desktop6
-rw-r--r--ultrastardxwp.patch13
5 files changed, 20 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 64b5b8e0cef1..6b93f7494a39 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
# Generated by mksrcinfo v8
-# Tue Dec 6 22:40:48 UTC 2016
+# Mon Apr 17 20:06:14 UTC 2017
pkgbase = ultrastardxwp-git
pkgdesc = UltraStar Deluxe WorldParty is a free and open source karaoke game. It allows up to six players to sing along with music using microphones in order to score points, depending on the pitch of the voice and the rhythm of singing.
- pkgver = r20.915f975
- pkgrel = 2
+ pkgver = r25.9f5f917
+ pkgrel = 1
url = http://ultrastar-es.org
+ install = ultrastardxwp-git.install
arch = i686
arch = x86_64
license = GPL
@@ -25,11 +26,9 @@ pkgbase = ultrastardxwp-git
depends = ttf-freefont
conflicts = ultrastardxwp-git
options = !buildflags
- source = ultrastardxwp.patch
source = ultrastardxwp.desktop
source = ultrastardxwp::git+https://github.com/ultrastares/usdxworldparty/
- md5sums = d9689465f6729ae9bb310f704206be7b
- md5sums = 47b4f962b66c6f96929b66a27a073b2e
+ md5sums = 45e724d9c3ab756ed908774daedfac24
md5sums = SKIP
pkgname = ultrastardxwp-git
diff --git a/PKGBUILD b/PKGBUILD
index d331a670f713..b3fed0be3184 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
# Maintainer: fenuks
# Based on ultrastardx-git PKGBUILD
+_usdx_package=WorldParty
_pkgname=ultrastardxwp
pkgname=${_pkgname}-git
-pkgver=r20.915f975
-pkgrel=2
+pkgver=r25.9f5f917
+pkgrel=1
pkgdesc="UltraStar Deluxe WorldParty is a free and open source karaoke game. It allows up to six players to sing along with music using microphones in order to score points, depending on the pitch of the voice and the rhythm of singing."
arch=("i686" "x86_64")
url="http://ultrastar-es.org"
@@ -14,12 +15,10 @@ makedepends=("git" "fpc")
optdepends=()
conflicts=("${pkgname}")
options=("!buildflags")
-# install=$pkgname.install
-source=("${_pkgname}.patch"
- "${_pkgname}.desktop"
+install=${pkgname}.install
+source=("${_pkgname}.desktop"
"${_pkgname}::git+https://github.com/ultrastares/usdxworldparty/")
-md5sums=('d9689465f6729ae9bb310f704206be7b'
- '47b4f962b66c6f96929b66a27a073b2e'
+md5sums=('45e724d9c3ab756ed908774daedfac24'
'SKIP')
pkgver() {
@@ -29,7 +28,6 @@ pkgver() {
prepare() {
cd "${srcdir}/${_pkgname}"
- patch -p1 -i "${srcdir}/${_pkgname}.patch"
chmod +x autogen.sh
./autogen.sh
}
@@ -38,13 +36,12 @@ build() {
cd "${srcdir}/${_pkgname}"
chmod +x configure
PKG_CONFIG_PATH="/usr/lib/ffmpeg2.8/pkgconfig" ./configure --prefix=/usr
- make EXEEXT="wp" USDX_PACKAGE_NAME="ultrastardxwp"
+ make
}
package() {
cd "${srcdir}/${_pkgname}"
- touch COPYING.txt
- make install DESTDIR="$pkgdir" EXEEXT="wp" USDX_PACKAGE_NAME="ultrastardxwp"
+ make install DESTDIR="$pkgdir"
install -Dm644 "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
- install -Dm644 "${pkgdir}/usr/share/${_pkgname}/resources/icons/ultrastardx-icon.png" "${pkgdir}/usr/share/icons/${_pkgname}.png"
+ install -Dm644 "${pkgdir}/usr/share/${_usdx_package}/resources/icons/${_usdx_package}.png" "${pkgdir}/usr/share/icons/${_usdx_package}.png"
}
diff --git a/ultrastardxwp-git.install b/ultrastardxwp-git.install
new file mode 100644
index 000000000000..e317a6b1447c
--- /dev/null
+++ b/ultrastardxwp-git.install
@@ -0,0 +1,3 @@
+post_install(){
+ echo "==> Application data directory has changed from ~/.ultrastardxwp to ~/.WorldParty, please move your files."
+}
diff --git a/ultrastardxwp.desktop b/ultrastardxwp.desktop
index 1fa5ab195e88..70b27ea392c0 100644
--- a/ultrastardxwp.desktop
+++ b/ultrastardxwp.desktop
@@ -5,10 +5,10 @@ Name=UltraStar Deluxe WorldParty
Comment=Karaoke program that evaluates your performance
Comment[de]=Singe Karaoke und messe dich mit anderen Spielern
-Icon=ultrastardxwp
+Icon=WorldParty
-TryExec=ultrastardxwp
-Exec=ultrastardxwp
+TryExec=WorldParty
+Exec=WorldParty
StartupNotify=false
Terminal=false
diff --git a/ultrastardxwp.patch b/ultrastardxwp.patch
deleted file mode 100644
index 13667f34b6e1..000000000000
--- a/ultrastardxwp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/base/UPlatformLinux.pas b/src/base/UPlatformLinux.pas
-index cdce2e4..90270a0 100644
---- a/src/base/UPlatformLinux.pas
-+++ b/src/base/UPlatformLinux.pas
-@@ -118,7 +118,7 @@ begin
- if UseLocalDirs then
- Result := GetExecutionDir()
- else
-- Result := GetHomeDir().Append('.ultrastardx', pdAppend);
-+ Result := GetHomeDir().Append('.ultrastardxwp', pdAppend);
- end;
-
- {**