summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Weiss2017-06-23 19:05:04 +0200
committerLuca Weiss2017-06-23 19:05:04 +0200
commita6ba0c1939729b68104f850adf6df5f5696b540b (patch)
tree57ac36bdb6aebefb36da41930d774064451e1b1e
parente9248975793809432f6abde1249e9f5b4920ac8c (diff)
downloadaur-a6ba0c1939729b68104f850adf6df5f5696b540b.tar.gz
Fix is upstream
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD12
-rw-r--r--fix_build.patch11
3 files changed, 9 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8497d8af6017..9028887b13f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Thu Jun 22 20:45:45 UTC 2017
+# Fri Jun 23 17:03:53 UTC 2017
pkgbase = isoimagewriter-git
pkgdesc = A program to write hybrid ISO files onto a USB disk from Linux, Mac or Windows ready to boot.
- pkgver = 0.1.r0.gdd48057
+ pkgver = 0.1.r3.g50219e1
pkgrel = 1
url = https://community.kde.org/ISOImageWriter
arch = x86_64
@@ -15,10 +15,10 @@ pkgbase = isoimagewriter-git
depends = ki18n
depends = kauth
depends = qgpgme
+ provides = isoimagewriter
+ conflicts = isoimagewriter
source = git+https://anongit.kde.org/isoimagewriter.git
- source = fix_build.patch
sha512sums = SKIP
- sha512sums = 6cdb771a4c54f59d6884fa1d43ad4c913c91e86437de9255ec6ed133179d84f8bf44509fa7682ac7b70166e48a1d010371a637ec8756a1e40d631396878d477a
pkgname = isoimagewriter-git
diff --git a/PKGBUILD b/PKGBUILD
index 7116960be815..9de192f5c3e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_pkgname=isoimagewriter
pkgname=$_pkgname-git
-pkgver=0.1.r0.gdd48057
+pkgver=0.1.r3.g50219e1
pkgrel=1
pkgdesc="A program to write hybrid ISO files onto a USB disk from Linux, Mac or Windows ready to boot."
arch=("x86_64" "i686")
@@ -10,10 +10,10 @@ url="https://community.kde.org/ISOImageWriter"
license=('GPL3')
depends=('ki18n' 'kauth' 'qgpgme')
makedepends=('git' 'cmake' 'extra-cmake-modules' 'python')
-source=(git+https://anongit.kde.org/isoimagewriter.git
- fix_build.patch)
-sha512sums=('SKIP'
- '6cdb771a4c54f59d6884fa1d43ad4c913c91e86437de9255ec6ed133179d84f8bf44509fa7682ac7b70166e48a1d010371a637ec8756a1e40d631396878d477a')
+provides=("$_pkgname")
+conflicts=("$_pkgname")
+source=(git+https://anongit.kde.org/isoimagewriter.git)
+sha512sums=('SKIP')
pkgver() {
cd $_pkgname
@@ -22,8 +22,6 @@ pkgver() {
prepare() {
mkdir -p build
- cd $_pkgname
- patch -Np0 < $srcdir/fix_build.patch
}
build() {
diff --git a/fix_build.patch b/fix_build.patch
deleted file mode 100644
index 6ca1c11a7ce0..000000000000
--- a/fix_build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.old 2017-06-22 21:58:14.005408596 +0200
-+++ CMakeLists.txt 2017-06-22 21:58:21.068781908 +0200
-@@ -31,7 +31,7 @@
-
- add_subdirectory(isoimagewriter)
- add_subdirectory(images)
--add_subdirectory(signing-keys)
-+#add_subdirectory(signing-keys)
-
- feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
-