diff -Nru squeak-vm-4.10.2.2614/debian/changelog squeak-vm-4.10.2.2614/debian/changelog --- squeak-vm-4.10.2.2614/debian/changelog 2018-07-16 10:36:41.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/changelog 2018-09-26 10:52:07.000000000 +0000 @@ -1,3 +1,24 @@ +squeak-vm (1:4.10.2.2614-8) unstable; urgency=medium + + * Add patch to add sa_restorer on HPPA. + Closes: Bug#528774. Thanks to Philipp Kern and John David Anglin. + + -- Jonas Smedegaard Wed, 26 Sep 2018 12:52:07 +0200 + +squeak-vm (1:4.10.2.2614-7) unstable; urgency=medium + + * Update patches: + + Add patch cherry-picked form OpenSmalltalk to fix CameraPlugin for + 64bit unix. + Closes: Bug#892016. + Thanks to Bernhard Übelacker, Adrian Bunk, and Tobias Pape. + + Drop obsolete unused patch npsqueak.patch. + + Add/update DEP-3 patch headers. + * Declare compliance with Debian Policy 4.2.1. + * Set Rules-Requires-Root: no. + + -- Jonas Smedegaard Sat, 22 Sep 2018 14:35:04 +0200 + squeak-vm (1:4.10.2.2614-6) unstable; urgency=medium * Limit compiler optimization workaround to adding compile options diff -Nru squeak-vm-4.10.2.2614/debian/control squeak-vm-4.10.2.2614/debian/control --- squeak-vm-4.10.2.2614/debian/control 2018-07-15 15:17:10.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/control 2018-09-22 12:37:24.000000000 +0000 @@ -28,10 +28,11 @@ uuid-dev, Build-Conflicts: libasound2-dev [!linux-any], -Standards-Version: 4.1.5 +Standards-Version: 4.2.1 Homepage: http://www.squeakvm.org/unix/ Vcs-Git: https://salsa.debian.org/pkg-sugar-team/squeak-vm.git Vcs-Browser: https://salsa.debian.org/pkg-sugar-team/squeak-vm +Rules-Requires-Root: no Package: squeak-vm Architecture: any diff -Nru squeak-vm-4.10.2.2614/debian/patches/0OpenSmalltalk20171006~203de23.patch squeak-vm-4.10.2.2614/debian/patches/0OpenSmalltalk20171006~203de23.patch --- squeak-vm-4.10.2.2614/debian/patches/0OpenSmalltalk20171006~203de23.patch 1970-01-01 00:00:00.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/patches/0OpenSmalltalk20171006~203de23.patch 2018-09-22 12:37:24.000000000 +0000 @@ -0,0 +1,139 @@ +Description: Fix CameraPlugin for 64bit unix +Author: Tobias Pape +Origin: other, https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/203de23 +Bug-Debian: https://bugs.debian.org/892016 +Last-Update: 2018-09-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/unix/plugins/CameraPlugin/sqCamera-linux.c ++++ b/unix/plugins/CameraPlugin/sqCamera-linux.c +@@ -30,6 +30,7 @@ + + #include + #include ++#include + #include + #include + +@@ -256,20 +257,20 @@ + / + */ + +-inline unsigned char ++inline uint8_t + clipPixel(const int pixel) { + int result; + result = ((pixel < 0) ? 0 : pixel); +- return (unsigned char) ((result > 255) ? 255: result); ++ return (uint8_t) ((result > 255) ? 255: result); + } + + + inline void + convertPixelYUV444toARGB32( +- const unsigned char y, +- const unsigned char u, +- const unsigned char v, +- unsigned char* dest) ++ const uint8_t y, ++ const uint8_t u, ++ const uint8_t v, ++ uint8_t* dest) + { + const int C = (y - 16) * 298 + 128; + const int D = u - 128; +@@ -286,14 +287,14 @@ + inline void + convertImageYUYVToARGB32 (camPtr cam) + { +- int i; ++ size_t i; + +- const unsigned char* src = cam->inBuffer; +- unsigned char* dst = cam->sqBuffer; +- unsigned long int *pdst; +- unsigned long int pixelCount = cam->sqPixels; ++ const uint8_t* src = cam->inBuffer; ++ uint8_t* dst = cam->sqBuffer; ++ uint32_t *pdst; ++ uint32_t pixelCount = cam->sqPixels; + +- unsigned char u, y1, v, y2; ++ uint8_t u, y1, v, y2; + + for (i = 0; i < pixelCount; i += 2) { + y1 = *src++; +@@ -319,11 +320,11 @@ + static void + convertImageRGB24toARGB32 (camPtr cam) + { +- unsigned char *src = cam->inBuffer; +- unsigned long int *dst = cam->sqBuffer; +- unsigned long int pixelCount = cam->sqPixels; +- unsigned long int pixel; +- int i; ++ uint8_t *src = cam->inBuffer; ++ uint32_t *dst = cam->sqBuffer; ++ uint32_t pixelCount = cam->sqPixels; ++ uint32_t pixel; ++ size_t i; + + if (0 == dst) return; + +@@ -338,11 +339,11 @@ + static void + convertImageRGB444toARGB32 (camPtr cam) + { +- unsigned char *src = cam->inBuffer; +- unsigned long int *dst = cam->sqBuffer; +- unsigned long int pixelCount = cam->sqPixels; +- unsigned long int r,g,b,pixel; +- int i; ++ uint8_t *src = cam->inBuffer; ++ uint32_t *dst = cam->sqBuffer; ++ uint32_t pixelCount = cam->sqPixels; ++ uint32_t r,g,b,pixel; ++ size_t i; + + if (0 == dst) return; + +@@ -364,11 +365,11 @@ + static void + convertImageRGB565toARGB32 (camPtr cam) + { +- unsigned char *src = cam->inBuffer; +- unsigned long int *dst = cam->sqBuffer; +- unsigned long int pixelCount = cam->sqPixels; +- unsigned long int r,g,b,pixel; +- int i; ++ uint8_t *src = cam->inBuffer; ++ uint32_t *dst = cam->sqBuffer; ++ uint32_t pixelCount = cam->sqPixels; ++ uint32_t r,g,b,pixel; ++ size_t i; + + if (0 == dst) return; + +@@ -530,7 +531,7 @@ + static int + uninit_device (camPtr cam) + { +- unsigned int i; ++ size_t i; + + if (cam->buffers) + for (i = 0; i < cam->nBuffers; ++i) +@@ -577,11 +578,11 @@ + } + } + <<< */ +- ++/* what? this is set above.. + if (req.count < cam->nBuffers) return false; + if (cam->nBuffers < req.count) + printf("Excess Buffers: %i\n", req.count); +- ++*/ + if (!(cam->buffers = calloc (req.count, sizeof (struct buffer)))) + return false; + diff -Nru squeak-vm-4.10.2.2614/debian/patches/avoid_embedded_libs.patch squeak-vm-4.10.2.2614/debian/patches/avoid_embedded_libs.patch --- squeak-vm-4.10.2.2614/debian/patches/avoid_embedded_libs.patch 2018-07-15 05:04:28.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/patches/avoid_embedded_libs.patch 2018-09-22 12:37:24.000000000 +0000 @@ -1,10 +1,12 @@ Description: Link against system shared PCRE and JPEG libraries Author: Neil Williams Author: Julian Taylor +Origin: other, https://bugs.debian.org/634240#33 Bug-Debian: http://bugs.debian.org/634240 Bug-Debian: http://bugs.debian.org/710367 -Last-Update: 2015-07-21 - +Last-Update: 2018-09-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/unix/CMakeLists.txt +++ b/unix/CMakeLists.txt @@ -117,10 +117,17 @@ diff -Nru squeak-vm-4.10.2.2614/debian/patches/clang_FTBFS_Wreturn-type.patch squeak-vm-4.10.2.2614/debian/patches/clang_FTBFS_Wreturn-type.patch --- squeak-vm-4.10.2.2614/debian/patches/clang_FTBFS_Wreturn-type.patch 2018-07-15 05:04:28.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/patches/clang_FTBFS_Wreturn-type.patch 2018-09-22 12:37:24.000000000 +0000 @@ -1,6 +1,10 @@ Description: fix FTBFS with clang instead of gcc Author: Nicolas Sévelin-Radiguet -Last-Update: 2014-03-06 +Origin: other, https://bugs.debian.org/740972#5 +Bug-Debian: https://bugs.debian.org/740972 +Last-Update: 2018-09-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c +++ b/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c @@ -995,10 +995,10 @@ diff -Nru squeak-vm-4.10.2.2614/debian/patches/defaultSourcesSystemAttribute.patch squeak-vm-4.10.2.2614/debian/patches/defaultSourcesSystemAttribute.patch --- squeak-vm-4.10.2.2614/debian/patches/defaultSourcesSystemAttribute.patch 2018-07-15 05:04:28.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/patches/defaultSourcesSystemAttribute.patch 2018-09-22 12:37:24.000000000 +0000 @@ -1,3 +1,8 @@ +Description: Set default place for sources +Author: José L. Redrejo Rodríguez +Last-Update: 2018-09-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/unix/vm/sqUnixMain.c +++ b/unix/vm/sqUnixMain.c @@ -448,6 +448,9 @@ diff -Nru squeak-vm-4.10.2.2614/debian/patches/fix_printf_syntax.patch squeak-vm-4.10.2.2614/debian/patches/fix_printf_syntax.patch --- squeak-vm-4.10.2.2614/debian/patches/fix_printf_syntax.patch 2018-07-15 05:04:28.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/patches/fix_printf_syntax.patch 2018-09-22 12:37:24.000000000 +0000 @@ -1,6 +1,8 @@ Description: Improve printf syntax to work with hardened build options Author: Jonas Smedegaard Last-Update: 2012-12-25 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/Cross/plugins/Squeak3D/b3dMain.c +++ b/Cross/plugins/Squeak3D/b3dMain.c @@ -63,7 +63,7 @@ diff -Nru squeak-vm-4.10.2.2614/debian/patches/mpeg_includes.patch squeak-vm-4.10.2.2614/debian/patches/mpeg_includes.patch --- squeak-vm-4.10.2.2614/debian/patches/mpeg_includes.patch 2018-07-15 05:04:28.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/patches/mpeg_includes.patch 2018-09-22 12:37:24.000000000 +0000 @@ -1,3 +1,10 @@ +Description: Add missing includes +Author: Petter Reinholdtsen +Origin: other, https://bugs.debian.org/567366#10 +Bug-Debian: https://bugs.debian.org/567366 +Last-Update: 2018-09-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/Cross/plugins/Mpeg3Plugin/libmpeg/changesForSqueak.c +++ b/Cross/plugins/Mpeg3Plugin/libmpeg/changesForSqueak.c @@ -47,6 +47,8 @@ diff -Nru squeak-vm-4.10.2.2614/debian/patches/npsqueak.patch squeak-vm-4.10.2.2614/debian/patches/npsqueak.patch --- squeak-vm-4.10.2.2614/debian/patches/npsqueak.patch 2018-07-15 05:04:28.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/patches/npsqueak.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -Index: squeak-vm-4.0.3.2202/unix/npsqueak/Makefile -=================================================================== ---- squeak-vm-4.0.3.2202.orig/unix/npsqueak/Makefile 2010-04-15 18:41:37.000000000 +0200 -+++ squeak-vm-4.0.3.2202/unix/npsqueak/Makefile 2010-04-15 18:43:49.000000000 +0200 -@@ -11,10 +11,10 @@ - LDFLAGS = -L/usr/X11R6/lib -lXt - - # usually overridden from top level makefile --VM_VERSION= 3.9-12 --bindir= /usr/local/bin --imgdir= /usr/local/share/squeak --plgdir= /usr/local/lib/squeak/$(VM_VERSION) -+VM_VERSION= 3.10-3 -+bindir= /usr/bin -+imgdir= /usr/share/squeak -+plgdir= /usr/lib/squeak/$(VM_VERSION) - - # configuration - scriptdir= $(imgdir) -Index: squeak-vm-4.0.3.2202/unix/npsqueak/npsqueakregister.in -=================================================================== ---- squeak-vm-4.0.3.2202.orig/unix/npsqueak/npsqueakregister.in 2010-04-15 18:41:37.000000000 +0200 -+++ squeak-vm-4.0.3.2202/unix/npsqueak/npsqueakregister.in 2010-04-15 18:43:49.000000000 +0200 -@@ -8,7 +8,7 @@ - # Parameters: -u unregister - - NPSQUEAK_SO=@NPSQUEAK_SO@ --BROWSERS="netscape mozilla mozilla-firefox opera MozillaFirefox/lib" -+BROWSERS="iceweasel netscape mozilla mozilla-firefox opera MozillaFirefox/lib" - BROWSER_DIRS="/usr/local/lib /usr/lib /opt" - SYSTEM_BROWSER_DIR="/usr/lib/browser-plugins" - -Index: squeak-vm-4.0.3.2202/unix/npsqueak/npsqueakrun.in -=================================================================== ---- squeak-vm-4.0.3.2202.orig/unix/npsqueak/npsqueakrun.in 2010-04-15 18:41:37.000000000 +0200 -+++ squeak-vm-4.0.3.2202/unix/npsqueak/npsqueakrun.in 2010-04-15 18:43:49.000000000 +0200 -@@ -11,8 +11,8 @@ - imgdir=@imgdir@ - - IMAGE=${imgdir}/SqueakPlugin.image --VM=squeak --VMOPTIONS=" -mmap 1024 -vm-display-x11 -swapbtn " -+VM=${imgdir}/${VM_VERSION}/squeak -+VMOPTIONS=" -vm-display-x11 -swapbtn " - LOGFILE=/tmp/npsqueak.log - - pdebug() -Index: squeak-vm-4.0.3.2202/unix/npsqueak/npsqueak.c -=================================================================== ---- squeak-vm-4.0.3.2202.orig/unix/npsqueak/npsqueak.c 2010-04-15 18:45:30.000000000 +0200 -+++ squeak-vm-4.0.3.2202/unix/npsqueak/npsqueak.c 2010-04-15 18:46:56.000000000 +0200 -@@ -284,7 +284,9 @@ - SYSTEM_BIN_DIR"/"}; - if (findFileInPaths(plugin->vmName, NPSQUEAKRUN, 2 , bin_dir_v) == 0){ - fprintf(stderr, "Squeak Plugin: npsqueakrun not found!\n"); -+ /* - return NPERR_GENERIC_ERROR; -+ */ - } - } - -@@ -298,8 +300,8 @@ - failureUrl); - plugin->failureUrl= NPN_StrDup(failureUrl); - }else { -- fprintf(stderr, "Squeak Plugin: no failure URL: \n"); -- return NPERR_GENERIC_ERROR; -+ strcpy(plugin->imageName, user_img_dir); -+ strcat(plugin->imageName, "/SqueakPlugin.image"); - } - } - plugin->argv[6]= NPN_StrDup(plugin->imageName); diff -Nru squeak-vm-4.10.2.2614/debian/patches/series squeak-vm-4.10.2.2614/debian/patches/series --- squeak-vm-4.10.2.2614/debian/patches/series 2018-07-15 05:04:28.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/patches/series 2018-09-26 10:45:15.000000000 +0000 @@ -1,6 +1,8 @@ +0OpenSmalltalk20171006~203de23.patch defaultSourcesSystemAttribute.patch mpeg_includes.patch #npsqueak.patch avoid_embedded_libs.patch fix_printf_syntax.patch clang_FTBFS_Wreturn-type.patch +vm-hppa.patch diff -Nru squeak-vm-4.10.2.2614/debian/patches/vm-hppa.patch squeak-vm-4.10.2.2614/debian/patches/vm-hppa.patch --- squeak-vm-4.10.2.2614/debian/patches/vm-hppa.patch 1970-01-01 00:00:00.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/patches/vm-hppa.patch 2018-09-26 10:49:31.000000000 +0000 @@ -0,0 +1,29 @@ +Description: Add sa_restorer on HPPA +Author: John David Anglin +Origin: other, https://bugs.debian.org/528774#12 +Bug-Debian: https://bugs.debian.org/528774 +Last-Update: 2018-09-26 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/unix/vm-display-fbdev/sqUnixFBDevKeyboard.c ++++ b/unix/vm-display-fbdev/sqUnixFBDevKeyboard.c +@@ -258,7 +258,7 @@ + sa.sa_handler= sigusr1; + sigemptyset(&sa.sa_mask); + sa.sa_flags= 0; +-# if !defined(__ia64) && !defined(__alpha__) ++# if !defined(__ia64) && !defined(__alpha__) && !defined(__hppa__) + sa.sa_restorer= 0; + # endif + sigaction(SIGUSR1, &sa, 0); +--- a/unix/vm/sqUnixMain.c ++++ b/unix/vm/sqUnixMain.c +@@ -152,7 +152,7 @@ + # else + sa.sa_flags= 0; /* assume we already have BSD behaviour */ + # endif +-# if defined(__linux__) && !defined(__ia64) && !defined(__alpha__) ++# if defined(__linux__) && !defined(__ia64) && !defined(__alpha__) && !defined(__hppa__) + sa.sa_restorer= 0; + # endif + sigaction(SIGALRM, &sa, 0);