Advertisement
Guest User

aur-gargoyle-git.patch

a guest
Jul 9th, 2024
37
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 5.66 KB | Gaming | 0 0
  1. diff --git a/.SRCINFO b/.SRCINFO
  2. index 1585a9b..1b8a1c1 100644
  3. --- a/.SRCINFO
  4. +++ b/.SRCINFO
  5. @@ -1,14 +1,21 @@
  6.  pkgbase = gargoyle-git
  7.     pkgdesc = Interactive Fiction multi-interpreter that supports all major IF formats (development version)
  8. -   pkgver = 2022.1.r563.gbde657b4
  9. +   pkgver = 2022.1.r691.g46c97ec5
  10.     pkgrel = 1
  11.     url = https://github.com/garglk/garglk
  12.     install = gargoyle-git.install
  13.     arch = i686
  14.     arch = x86_64
  15.     arch = armv6h
  16. -   groups = inform
  17. -   license = GPL
  18. +   arch = armv7h
  19. +   arch = aarch64
  20. +   license = GPL2
  21. +   license = GPL3
  22. +   license = custom:BSD-2-Clause
  23. +   license = custom:BSD-3-Clause
  24. +   license = Artistic2.0
  25. +   license = MIT
  26. +   license = custom:OFL-1.1
  27.     makedepends = cmake
  28.     makedepends = pkgconfig
  29.     makedepends = desktop-file-utils
  30. @@ -17,19 +24,20 @@ pkgbase = gargoyle-git
  31.     depends = sdl2_mixer
  32.     depends = sdl2
  33.     depends = freetype2
  34. -   depends = qt5-base
  35. +   depends = qt6-base
  36.     depends = fontconfig
  37.     depends = libjpeg
  38.     depends = libpng
  39. +   depends = zlib
  40. +   depends = hicolor-icon-theme
  41.     optdepends = speech-dispatcher: text-to-speech support
  42. -   provides = gargoyle-git
  43. +   provides = gargoyle
  44.     conflicts = gargoyle-mod
  45.     conflicts = gargoyle
  46.     replaces = gargoyle-mod
  47.     replaces = gargoyle
  48. +   backup = etc/garglk.ini
  49.     source = gargoyle-git::git+https://github.com/garglk/garglk.git
  50. -   source = gargoyle-git.install
  51.     sha512sums = SKIP
  52. -   sha512sums = 1fa602865745c1c9801178ee9b24be86215f2af4f9ee3f4f3b3c0606a87aba32a67c9c5343b481332c8fc97ff6c1a5e447f074d116c0cc5b255af35098096e6e
  53.  
  54.  pkgname = gargoyle-git
  55. diff --git a/PKGBUILD b/PKGBUILD
  56. index b564a7d..cee12c8 100644
  57. --- a/PKGBUILD
  58. +++ b/PKGBUILD
  59. @@ -4,37 +4,69 @@
  60.  #     Michael Smith <michael at diglumi dot com>
  61.  #     Marcin Skory <armitage at q84fh dot net>
  62.  #     with Contribution of Eric Forgeot < http://ifiction.free.fr >
  63. +
  64.  pkgname=gargoyle-git
  65. -pkgver=2022.1.r563.gbde657b4
  66. +pkgver=2022.1.r691.g46c97ec5
  67.  pkgrel=1
  68.  pkgdesc="Interactive Fiction multi-interpreter that supports all major IF formats (development version)"
  69. -arch=('i686' 'x86_64' 'armv6h')
  70. +arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
  71.  url="https://github.com/garglk/garglk"
  72. -license=('GPL')
  73. -depends=('sdl2_mixer' 'sdl2' 'freetype2' 'qt5-base' 'fontconfig' 'libjpeg' 'libpng')
  74. +license=('GPL2' 'GPL3' 'custom:BSD-2-Clause' 'custom:BSD-3-Clause' 'Artistic2.0'
  75. +         'MIT' 'custom:OFL-1.1')
  76. +depends=('sdl2_mixer' 'sdl2' 'freetype2' 'qt6-base' 'fontconfig' 'libjpeg'
  77. +         'libpng' 'zlib' 'hicolor-icon-theme')
  78.  makedepends=('cmake' 'pkgconfig' 'desktop-file-utils' 'git' 'fmt')
  79.  optdepends=('speech-dispatcher: text-to-speech support')
  80. -provides=('gargoyle-git')
  81. +provides=('gargoyle')
  82.  conflicts=('gargoyle-mod' 'gargoyle')
  83.  replaces=('gargoyle-mod' 'gargoyle')
  84. -groups=(inform)
  85. -source=("$pkgname::git+https://github.com/garglk/garglk.git" "gargoyle-git.install")
  86. -install=${pkgname}.install
  87. -sha512sums=('SKIP'
  88. -            '1fa602865745c1c9801178ee9b24be86215f2af4f9ee3f4f3b3c0606a87aba32a67c9c5343b481332c8fc97ff6c1a5e447f074d116c0cc5b255af35098096e6e')
  89. +backup=('etc/garglk.ini')
  90. +# groups=(inform)
  91. +install=$pkgname.install
  92. +source=("$pkgname"::'git+https://github.com/garglk/garglk.git')
  93. +sha512sums=('SKIP')
  94.  
  95.  pkgver() {
  96. -  cd "$pkgname"
  97. -  git describe --long --tags | sed 's/\([^-]*-g\)/r/;s/-/./g'
  98. +    cd "$srcdir/$pkgname"
  99. +    if git describe --long --tags >/dev/null 2>&1; then
  100. +        git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r/;s/-/./g'
  101. +    else
  102. +        printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git describe --always)"
  103. +    fi
  104.  }
  105.  
  106.  build() {
  107. -   cmake -S "${pkgname}" -B "build" -DWITH_TTS=DYNAMIC -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
  108. -   cmake --build "build"
  109. +    cd "$srcdir/$pkgname"
  110. +
  111. +    # Extract the license for Git from the readme
  112. +    sed -n '/Copyright (c)/,/DEALINGS IN THE SOFTWARE\./p' \
  113. +        terps/git/README.txt > terps/git/LICENSE
  114. +
  115. +    cmake -S . -B build \
  116. +        -DCMAKE_BUILD_TYPE=Release \
  117. +        -DWITH_QT6=true \
  118. +        -DWITH_TTS=DYNAMIC \
  119. +        -DCMAKE_INSTALL_LIBEXECDIR=lib \
  120. +        -DCMAKE_INSTALL_PREFIX=/usr
  121. +    cmake --build build
  122.  }
  123.  
  124.  package() {
  125. -   cmake --install "build"
  126. -   # Install default config
  127. -   install -Dm755 "$srcdir/${pkgname}/garglk/garglk.ini" "$pkgdir/etc/garglk.ini"
  128. +    cd "$srcdir/$pkgname"
  129. +    DESTDIR="$pkgdir" cmake --install build
  130. +
  131. +    # Install default config
  132. +    install -Dm644 "$srcdir/$pkgname/garglk/garglk.ini" -t "$pkgdir/etc/"
  133. +
  134. +    # Install licenses
  135. +    local license_dir="$pkgdir/usr/share/licenses/$pkgname"
  136. +    install -Dm644 "$srcdir/$pkgname/License.txt" "$license_dir/LICENSE"
  137. +    install -Dm644 "$srcdir/$pkgname/licenses/BSD-2-Clause.txt" "$license_dir/BSD-2-Clause.txt"
  138. +    install -Dm644 "$srcdir/$pkgname/licenses/Go Mono.txt" "$license_dir/BSD-3-Clause-Go-Mono.txt"
  139. +    install -Dm644 "$srcdir/$pkgname/terps/advsys/LICENSE" "$license_dir/BSD-3-Clause-AdvSys.txt"
  140. +    install -Dm644 "$srcdir/$pkgname/terps/git/LICENSE" "$license_dir/MIT-Git.txt"
  141. +    install -Dm644 "$srcdir/$pkgname/terps/glulxe/LICENSE" "$license_dir/MIT-Glulxe.txt"
  142. +    install -Dm644 "$srcdir/$pkgname/licenses/Charis SIL.txt" "$license_dir/OFL-1.1.txt"
  143.  }
  144. +
  145. +# vim: set ts=4 sw=4 et :
  146. diff --git a/gargoyle-git.install b/gargoyle-git.install
  147. index 2fa8b37..c5bbe36 100644
  148. --- a/gargoyle-git.install
  149. +++ b/gargoyle-git.install
  150. @@ -1,10 +1,10 @@
  151.  post_install() {
  152. -  update-mime-database usr/share/mime > /dev/null
  153. -  update-desktop-database -q
  154. +    update-mime-database usr/share/mime >/dev/null
  155. +    update-desktop-database -q
  156.  }
  157.  post_upgrade() {
  158. -  post_install
  159. +    post_install
  160.  }
  161.  post_remove() {
  162. -  post_install
  163. +    post_install
  164.  }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement