From dc21c5d631a1bde22d1abeea8ab8642ef8fc63e8b4b175fab376ea3e936d250a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 25 Jul 2016 06:44:44 +0000 Subject: [PATCH] Accepting request 414925 from home:KGronlund:branches:devel:languages:misc Updated package to version 6.6. OBS-URL: https://build.opensuse.org/request/show/414925 OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/racket?expand=0&rev=18 --- ...ix-install-path-for-doc-and-collects.patch | 50 --- drracket.desktop | 10 - drracket.png | 3 - gc-aarch64.patch | 69 +++++ libpng16-adjustment.patch | 30 -- libpng16.patch | 52 ---- racket-5.3.6-src-unix.tgz | 3 - racket-5.3.rpmlintrc | 2 + racket-6.6-src.tgz | 3 + racket.changes | 10 + racket.spec | 289 ++++-------------- 11 files changed, 135 insertions(+), 386 deletions(-) delete mode 100644 0001-Fix-install-path-for-doc-and-collects.patch delete mode 100644 drracket.desktop delete mode 100644 drracket.png create mode 100644 gc-aarch64.patch delete mode 100644 libpng16-adjustment.patch delete mode 100644 libpng16.patch delete mode 100644 racket-5.3.6-src-unix.tgz create mode 100644 racket-6.6-src.tgz diff --git a/0001-Fix-install-path-for-doc-and-collects.patch b/0001-Fix-install-path-for-doc-and-collects.patch deleted file mode 100644 index f3567a4..0000000 --- a/0001-Fix-install-path-for-doc-and-collects.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 2d3b04e8248d6d97323ef5ac30c48ba9ea967080 Mon Sep 17 00:00:00 2001 -From: madanyang -Date: Fri, 3 May 2013 19:55:08 +0200 -Subject: [PATCH] Fix install path for doc and collects - -docdir is hardcoded for /usr/share/doc but in openSUSE -/usr/share/doc/packages is used the base for documentations - -collectsdir is hardcoded to ${libdir}/collects in the configure -script, but we want to install the collects (which are mostly -arch-independent) into /usr/share, and symlink the small number of -exceptions into /usr/lib/racket/collects/$foo - -Signed-off-by: madanyang ---- - src/configure | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/src/configure -+++ b/src/configure -@@ -813,7 +813,7 @@ sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' - includedir='${prefix}/include' - oldincludedir='/usr/include' --docdir='${datarootdir}/doc/${PACKAGE}' -+docdir='${datarootdir}/doc/packages/${PACKAGE}' - infodir='${datarootdir}/info' - htmldir='${docdir}' - dvidir='${docdir}' -@@ -1317,7 +1317,7 @@ Fine tuning of the installation director - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --mandir=DIR man documentation [DATAROOTDIR/man] -- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/packages/PACKAGE] - _ACEOF - - cat <<\_ACEOF -@@ -2299,9 +2299,9 @@ else - prefix="${ac_default_prefix}" - fi - libpltdir="${libdir}/racket" -- collectsdir="${libdir}/racket/collects" -+ collectsdir="${datadir}/racket/collects" - includepltdir="${includedir}/racket" -- docdir="${datadir}/doc/racket" -+ docdir="${datadir}/doc/packages/racket" - MAKE_COPYTREE=copytree - COLLECTS_PATH='${collectsdir}' - INSTALL_ORIG_TREE=no diff --git a/drracket.desktop b/drracket.desktop deleted file mode 100644 index 08273a6..0000000 --- a/drracket.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=DrRacket -Categories=Development;IDE; -GenericName=Scheme programming -Comment=Programming environment for the Scheme programming language -Exec=drracket -Terminal=false -Icon=drracket -Type=Application -Encoding=UTF-8 diff --git a/drracket.png b/drracket.png deleted file mode 100644 index 47215ed..0000000 --- a/drracket.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e902d7be3d63fbabe5ca3fb1ca94290694f70bdf259501cd85f372156a7599a -size 6717 diff --git a/gc-aarch64.patch b/gc-aarch64.patch new file mode 100644 index 0000000..9e4e88f --- /dev/null +++ b/gc-aarch64.patch @@ -0,0 +1,69 @@ +Index: racket-5.3.5/src/racket/gc/include/private/gcconfig.h +=================================================================== +--- racket-5.3.5.orig/src/racket/gc/include/private/gcconfig.h ++++ racket-5.3.5/src/racket/gc/include/private/gcconfig.h +@@ -76,6 +76,13 @@ + # endif + + /* Determine the machine type: */ ++#if defined(__aarch64__) ++# define AARCH64 ++# if !defined(LINUX) ++# define NOSYS ++# define mach_type_known ++# endif ++# endif + # if defined(__arm__) || defined(__thumb__) + # define ARM32 + # if !defined(LINUX) && !defined(NETBSD) && !defined(OPENBSD) +@@ -249,6 +256,10 @@ + # define IA64 + # define mach_type_known + # endif ++# if defined(LINUX) && defined(__aarch64__) ++# define AARCH64 ++# define mach_type_known ++# endif + # if defined(LINUX) && defined(__arm__) + # define ARM32 + # define mach_type_known +@@ -529,6 +540,7 @@ + /* running Amdahl UTS4 */ + /* S390 ==> 390-like machine */ + /* running LINUX */ ++ /* AARCH64 ==> ARM AArch64 */ + /* ARM32 ==> Intel StrongARM */ + /* IA64 ==> Intel IPF */ + /* (e.g. Itanium) */ +@@ -1818,6 +1830,31 @@ + # endif + # endif + ++# ifdef AARCH64 ++# define CPP_WORDSZ 64 ++# define MACH_TYPE "AARCH64" ++# define ALIGNMENT 8 ++# ifndef HBLKSIZE ++# define HBLKSIZE 4096 ++# endif ++# ifdef LINUX ++# define OS_TYPE "LINUX" ++# define LINUX_STACKBOTTOM ++# define DYNAMIC_LOADING ++ extern int __data_start[]; ++# define DATASTART ((ptr_t)__data_start) ++ extern char _end[]; ++# define DATAEND ((ptr_t)(&_end)) ++# endif ++# ifdef NOSYS ++ /* __data_start is usually defined in the target linker script. */ ++ extern int __data_start[]; ++# define DATASTART ((ptr_t)__data_start) ++ extern void *__stack_base__; ++# define STACKBOTTOM ((ptr_t)__stack_base__) ++# endif ++# endif ++ + # ifdef ARM32 + # define CPP_WORDSZ 32 + # define MACH_TYPE "ARM32" diff --git a/libpng16-adjustment.patch b/libpng16-adjustment.patch deleted file mode 100644 index c2c6b01..0000000 --- a/libpng16-adjustment.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f97a7cf1778b74e9f38d97db61e91956565180c3 Mon Sep 17 00:00:00 2001 -From: Matthew Flatt -Date: Wed, 15 May 2013 20:38:40 -0600 -Subject: [PATCH] libpng adjustment - -Keep error if no "libpng" is found. ---- - collects/racket/draw/unsafe/png.rkt | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/collects/racket/draw/unsafe/png.rkt b/collects/racket/draw/unsafe/png.rkt -index a6b028d..f57de38 100644 ---- a/collects/racket/draw/unsafe/png.rkt -+++ b/collects/racket/draw/unsafe/png.rkt -@@ -12,10 +12,9 @@ - ;; variants often have just "libpng", etc. - (let loop ([alts '(("libpng16" ("16" "")) - ("libpng15" ("15" "")) -- ("libpng12" ("0" "")) -- ("libpng"))]) -+ ("libpng12" ("0" "")))]) - (cond -- [(null? alts) #f] -+ [(null? alts) (ffi-lib "libpng")] - [else (apply ffi-lib (car alts) - #:fail (lambda () - (loop (cdr alts))))]))] --- -1.8.2.3 - diff --git a/libpng16.patch b/libpng16.patch deleted file mode 100644 index 998905f..0000000 --- a/libpng16.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5629a6156a5720e51a277849f75b3135cb93664f Mon Sep 17 00:00:00 2001 -From: Matthew Flatt -Date: Wed, 15 May 2013 20:28:05 -0600 -Subject: [PATCH] support libpng16 - ---- - collects/racket/draw/unsafe/png.rkt | 21 ++++++++++++++------- - 1 file changed, 14 insertions(+), 7 deletions(-) - -diff --git a/collects/racket/draw/unsafe/png.rkt b/collects/racket/draw/unsafe/png.rkt -index 596fcb4..a6b028d 100644 ---- a/collects/racket/draw/unsafe/png.rkt -+++ b/collects/racket/draw/unsafe/png.rkt -@@ -10,11 +10,15 @@ - [(unix) - ;; Most Linux distros supply "libpng12", while other Unix - ;; variants often have just "libpng", etc. -- (ffi-lib "libpng15" '("15" "") -- #:fail (lambda () -- (ffi-lib "libpng12" '("0" "") -- #:fail (lambda () -- (ffi-lib "libpng")))))] -+ (let loop ([alts '(("libpng16" ("16" "")) -+ ("libpng15" ("15" "")) -+ ("libpng12" ("0" "")) -+ ("libpng"))]) -+ (cond -+ [(null? alts) #f] -+ [else (apply ffi-lib (car alts) -+ #:fail (lambda () -+ (loop (cdr alts))))]))] - [(macosx) (ffi-lib "libpng15.15.dylib")] - [(windows) - (ffi-lib "zlib1.dll") -@@ -29,9 +33,12 @@ - ;; assume that other versions are also ok - (define PNG_LIBPNG_VER_STRING (string->bytes/latin-1 - (let ([v (png_access_version_number)]) -- (format "~s.~s" -+ (format "~s.~s~a" - (quotient v 10000) -- (quotient (remainder v 10000) 100))))) -+ (quotient (remainder v 10000) 100) -+ (if (zero? (remainder v 100)) -+ "" -+ (format ".~a" (remainder v 100))))))) - - (define _png_structp (_cpointer 'png_structp)) - (define _png_infop (_cpointer 'png_infop)) --- -1.8.2.3 - diff --git a/racket-5.3.6-src-unix.tgz b/racket-5.3.6-src-unix.tgz deleted file mode 100644 index ed483bb..0000000 --- a/racket-5.3.6-src-unix.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7fe0ffc1231f888cd481f175e428f0217257dd136d2513bde73954af5a7cfb8a -size 19278914 diff --git a/racket-5.3.rpmlintrc b/racket-5.3.rpmlintrc index fc4a530..289c645 100644 --- a/racket-5.3.rpmlintrc +++ b/racket-5.3.rpmlintrc @@ -1 +1,3 @@ addFilter("unexpanded-macro /usr/share/racket/collects/srfi/") +addFilter("file-contains-buildroot.*/usr/share/racket/pkgs/.*zo") +addFilter("file-contains-buildroot.*/usr/share/doc/packages/racket/syntax/module-helpers.html") diff --git a/racket-6.6-src.tgz b/racket-6.6-src.tgz new file mode 100644 index 0000000..31be494 --- /dev/null +++ b/racket-6.6-src.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf2bce50b02c626666a8d2093638893e8beb8b2a19cdd43efa151a686c88edcf +size 20966104 diff --git a/racket.changes b/racket.changes index 5bf4ac1..fbb5047 100644 --- a/racket.changes +++ b/racket.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Jul 25 00:10:49 UTC 2016 - kgronlund@suse.com + +- Update to Racket 6.6 + +------------------------------------------------------------------- +Sun Aug 11 20:59:59 UTC 2013 - schwab@suse.de + +- gc-aarch64.patch: add support for aarch64 + ------------------------------------------------------------------- Sat May 3 01:37:00 UTC 2014 - MihailJP diff --git a/racket.spec b/racket.spec index 59b80d0..8e24edd 100644 --- a/racket.spec +++ b/racket.spec @@ -1,7 +1,7 @@ # # spec file for package racket # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012, 2013 Togan Muftuoglu toganm@opensuse.org # # All modifications and additions to the file contributed by third parties @@ -18,23 +18,20 @@ Name: racket -Version: 5.3.6 +Version: 6.6 Release: 0 Summary: Scheme implementation with teaching tools License: LGPL-2.1+ and GPL-3.0+ Group: Development/Languages/Scheme Url: http://racket-lang.org -Source0: http://download.racket-lang.org/installers/%version/%name/%name-%version-src-unix.tgz -Source1: drracket.desktop +Source0: http://download.racket-lang.org/installers/%version/%name-%version-src.tgz Source2: racket-completion.bash Source3: racket-5.3.rpmlintrc -Source4: drracket.png -# PATCH-FIX-OPENSUSE based on debian package toganm@opensuse.org -Patch0: 0001-Fix-install-path-for-doc-and-collects.patch +# PATCH-FIX-UPSTREAM aarch64 support for gc +Patch1: gc-aarch64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ImageMagick BuildRequires: chrpath -BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: ghostscript-fonts-std @@ -63,6 +60,9 @@ BuildRequires: pkgconfig(xmu) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(zlib) +Provides: %{name}-drracket = %{version}-%{release} +Provides: %{name}-games = %{version}-%{release} +Provides: %{name}-webserver = %{version}-%{release} # maggia has this # Disable the debug package since otherwise a build would create the following @@ -83,36 +83,8 @@ the creation of embedded and domain-specific languages, language constructs such as classes or modules, and separate dialects of Racket enable different semantics. - -%package -n drracket -Summary: Racket Scheme graphical development environment -Group: Development/Languages/Scheme -Requires: %{name} = %{version}-%{release} - -%description -n drracket -DrRacket is the graphical development environment for creating -Racket applications. - -%package games -Summary: Sample games from Racket Scheme -Group: Amusements/Games/Other -Requires: %{name} = %{version}-%{release} - -%description games -This package contains sample games from Racket project. - - -%package webserver -Summary: Webserver from Racket -Group: Productivity/Networking/Web/Servers -Requires: %{name} = %{version}-%{release} - -%description webserver -Webserver from Racket Scheme. - - %package devel -Summary: Development header files for PLT +Summary: Development header files for Racket Group: Development/Languages/Scheme Requires: %{name} = %{version}-%{release} Requires: glibc-devel @@ -120,66 +92,21 @@ Requires: libffi-devel %description devel This package contains the symlinks, headers and object files needed to -compile and link programs which use PLT. +compile and link programs which use Racket. %prep %setup -q -%patch0 -p1 +%patch1 -p1 -cp %{S:1} src/. cp %{S:2} src/. -cp %{S:4} src/. - -## debian had licence isssue before enabling these check - -# ( while read -r name ; do -# rm -r $name -# done ) <