Update to 2.4.29

1 files changed, 13 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 010eb2b107f6..d9d751406a87 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 _pkgname=vice
 pkgname=$_pkgname-gnomeui-devel
-pkgver=2.4.28
+pkgver=2.4.29
 pkgrel=1
 pkgdesc='Versatile Commodore Emulator (development release with the Gnome UI)'
 arch=('i686' 'x86_64')
@@ -28,17 +28,17 @@ source=(
   'no-fc-cache-no-lib64.patch'
   'zlib-1.2.7.patch'
   'notexi-notxt.patch'
-  'paraport-close-no-return.patch'
+  'cw.h'
 )
 sha512sums=(
-  '78fbff6fd56bd0055fc95329eca697983a0f576701ce140719cd506e02b139c459df9f3b63bcfd530530578ada9dd23ce4524dc21f10b707a602f4a5d20e6a8a'
+  '010b9937d5e1f5fcd7eab276960be638f8ba832c05bbdae104b25238314b65c1fcbcf43b4a08cd41918ca5b65009ca19638733b0299341e73c69951d67b89f0f'
   '1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf'
   'dc96b8658fac1a6f605b8f0052c11a5abb653da4b9deb3401d8b8177b14a664c0b3a5ed9e7c5c3013b0bc18b831045244f2f9187de9ff8b25b90f0b1cfa0cd8a'
   '076e684ecac402ccb014faebe5eaab5bb46e9e9caca9ba23374ddf94a1c83172b0874343e449c91186763114d0f388dac0060afd831bdc9eceffc6cf3529c58d'
-  'a0b764c15c0e55ef606ae8ba5c7e760ea197bebbea897e943d4097798e77f0bd08a4fc35bbfc0a006c7762538941d88362d7cb3efea137f5f0646f7056892585'
+  '702e00c0ff7117fd9b23c005728355d9fe325e5ab24a9d67ce8f39f77fda9aed786b4e65cc6a904ac8505cc2a5c52003525aa6bd937d9438460a20fe733d741d'
   'd37544313037fa75971bab198b37d3824571a3e82d4e87bbe23b01d8a847fcf3f6652a23e4bc58cec6ae43deccc9322db2f77d046641b521f275e368aca940dd'
-  '7506936c33eb5bb6843f5e6b340e9a0a30ce57aa5c7f569cbbf9fed541682965f02ada819f987be3b4800f61b32b6c15b789de708f5224f2a89519ce47779ffc'
-  '4b40ede13b86d49d6904b5e255fc707d51dad928d879325f5ee70e54026d7b2edfc691804e3a048133b2abb44e36116ec57d41551a82861b49712f37691073b6'
+  'd7637b0604490f1792dde1083211d418b850ecbeaf688b3013913c5af7e752796fe8d45c8306b7a1593b62c028c9def7bf04e81bc0187d05cd464727f0c5645a'
+  'b94e2a5420c89dbef21504e2b7d6ae4b36fd8ba751811228ef0310882c7626eea43b3cf19dbc9d22d2f5821793da8922a9af28a9eed1c2bf0aab4611e3de76e8'
 )
 
 prepare() {
@@ -48,13 +48,17 @@ prepare() {
   patch -Np1 -i ../no-fc-cache-no-lib64.patch
   patch -Np1 -i ../zlib-1.2.7.patch
   patch -Np1 -i ../notexi-notxt.patch
-  patch -Np1 -i ../paraport-close-no-return.patch
+
+  # Add missing header file
+  install -Dm644 ../cw.h src/arch/unix/cw.h
 
   # Convert MS-DOS linebreaks to Unix style ones
   printf '%s ' 'Converting MS-DOS format linebreaks to Unix format...'
+
   while read -r; do
-      dos2unix -q "$REPLY"
+    dos2unix -q "$REPLY"
   done < <(find . -type f -regextype posix-egrep -regex '.*\.([ch]|in)$')
+
   printf '%s\n' 'DONE!'
 
   # Reconfigure the project build environment
@@ -64,11 +68,7 @@ prepare() {
 build() {
   # Build the project
   cd $_pkgname-$pkgver
-  ./configure --prefix=/usr \
-              --enable-fullscreen \
-              --enable-gnomeui \
-              --enable-ethernet \
-              --enable-memmap
+  ./configure --prefix=/usr --enable-fullscreen --enable-gnomeui --enable-ethernet --enable-memmap
   make
 }
 
@@ -88,4 +88,3 @@ package() {
   install -d "$pkgdir/usr/share/fonts/TTF"
   ln -s /usr/lib/$_pkgname/fonts/CBM.ttf "$pkgdir/usr/share/fonts/TTF/CBM.ttf"
 }
-