From kde-commits Tue Dec 29 00:10:57 2015 From: Patrick Spendrin Date: Tue, 29 Dec 2015 00:10:57 +0000 To: kde-commits Subject: [emerge] portage/win32libs/libspectre: fix building libspectre with ghosty Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=145134787023276 Git commit b0e0c1de11dfb8056e707dff947cea7cb6801fe9 by Patrick Spendrin. Committed on 29/12/2015 at 00:09. Pushed by sengels into branch 'master'. fix building libspectre with ghosty M +6 -6 portage/win32libs/libspectre/libspectre-0.2.7-20131003.diff A +52 -0 portage/win32libs/libspectre/libspectre-new-ghostscript.diff M +2 -2 portage/win32libs/libspectre/libspectre.py http://commits.kde.org/emerge/b0e0c1de11dfb8056e707dff947cea7cb6801fe9 diff --git a/portage/win32libs/libspectre/libspectre-0.2.7-20131003.diff b/= portage/win32libs/libspectre/libspectre-0.2.7-20131003.diff index 5e9c943..ae5ea42 100644 --- a/portage/win32libs/libspectre/libspectre-0.2.7-20131003.diff +++ b/portage/win32libs/libspectre/libspectre-0.2.7-20131003.diff @@ -86,16 +86,16 @@ diff -Nru libspectre-0.2.6.orig/CMakeLists.txt libspect= re-0.2.6/CMakeLists.txt +install(FILES ${spectre_HDRS} DESTINATION include/libspectre) + +if(ENABLE_TESTS) -+ find_package(Qt4) ++ find_package(Qt5Gui) + + add_executable(parser-test test/parser-test.c) + target_link_libraries(parser-test spectre) -+ if(QT4_FOUND) -+ include_directories(${QT_INCLUDES}) ++ if(Qt5Gui_FOUND) ++ include_directories(${Qt5Gui_INCLUDE_DIRS}) + add_executable(spectre-test test/spectre-test.cpp) -+ target_link_libraries(spectre-test spectre ${QT_QTCORE_LIBRARY} $= {QT_QTGUI_LIBRARY}) -+ endif(QT4_FOUND) -+endif(ENABLE_TESTS) ++ target_link_libraries(spectre-test spectre ${Qt5Gui_LIBRARIES}) ++ endif() ++endif() diff -Nru libspectre-0.2.6.orig/config.h.cmake libspectre-0.2.6/config.h.c= make --- libspectre-0.2.6.orig/config.h.cmake 1970-01-01 01:00:00.000000000 +01= 00 +++ libspectre-0.2.6/config.h.cmake 2010-11-17 03:10:16.223170600 +0100 diff --git a/portage/win32libs/libspectre/libspectre-new-ghostscript.diff b= /portage/win32libs/libspectre/libspectre-new-ghostscript.diff new file mode 100644 index 0000000..a5f668f --- /dev/null +++ b/portage/win32libs/libspectre/libspectre-new-ghostscript.diff @@ -0,0 +1,52 @@ +diff -Nrub -x '*~' -x '*\.orig' -x'*\.o' libspectre-0.2.7.orig/libspectre/= spectre-gs.c libspectre-0.2.7/libspectre/spectre-gs.c +--- libspectre-0.2.7.orig/libspectre/spectre-gs.c 2015-12-17 15:59:37.5297= 03600 +0100 ++++ libspectre-0.2.7/libspectre/spectre-gs.c 2015-12-17 15:57:37.938863400= +0100 +@@ -31,6 +31,12 @@ + = + #define BUFFER_SIZE 32768 + = ++#if 1 ++#define GS_E(err) gs_error_##err ++#else ++#define GS_E(err) e_##err ++#endif ++ + struct SpectreGS { + void *ghostscript_instance; + }; +@@ -43,12 +49,12 @@ + = + if (code <=3D -100) { + switch (code) { +- case e_Fatal: ++ case GS_E(Fatal): + fprintf (stderr, "fatal internal error %d", code); + return TRUE; + break; + = +- case e_ExecStackUnderflow: ++ case GS_E(ExecStackUnderflow): + fprintf (stderr, "stack overflow %d", code); + return TRUE; + break; +@@ -109,9 +115,9 @@ + set =3D _spectre_strdup_printf ("%d %d translate\n", -x, -y); + error =3D gsapi_run_string_continue (ghostscript_instance, set, strlen = (set), + 0, &exit_code); +- error =3D error =3D=3D e_NeedInput ? 0 : error; ++ error =3D error =3D=3D GS_E(NeedInput) ? 0 : error; + free (set); +- if (error !=3D e_NeedInput && critic_error_code (error)) { ++ if (error !=3D GS_E(NeedInput) && critic_error_code (error)) { + fclose (fd); + return FALSE; + } +@@ -126,7 +132,7 @@ + read =3D fread (buf, sizeof (char), to_read, fd); + error =3D gsapi_run_string_continue (ghostscript_instance, + buf, read, 0, &exit_code); +- error =3D error =3D=3D e_NeedInput ? 0 : error; ++ error =3D error =3D=3D GS_E(NeedInput) ? 0 : error; + left -=3D read; + } + = diff --git a/portage/win32libs/libspectre/libspectre.py b/portage/win32libs= /libspectre/libspectre.py index 1b69746..aa1d34f 100644 --- a/portage/win32libs/libspectre/libspectre.py +++ b/portage/win32libs/libspectre/libspectre.py @@ -8,7 +8,7 @@ class subinfo(info.infoclass): self.targetInstSrc[ver] =3D "libspectre-" + ver self.patchToApply["0.2.1"] =3D ("spectre-0.2.1-cmake.diff", 1) self.patchToApply["0.2.6"] =3D ("libspectre-0.2.6-20101117.diff", = 1) - self.patchToApply["0.2.7"] =3D ("libspectre-0.2.7-20131003.diff", = 1) + self.patchToApply["0.2.7"] =3D [("libspectre-0.2.7-20131003.diff",= 1), ("libspectre-new-ghostscript.diff", 1)] self.targetDigests['0.2.6'] =3D '819475c7e34a1e9bc2e876110fee530b4= 2aecabd' self.targetDigests['0.2.7'] =3D 'a7efd97b82b84ff1bb7a0d88c7e35ad10= cc84ea8' = @@ -16,7 +16,7 @@ class subinfo(info.infoclass): self.defaultTarget =3D '0.2.7' = def setDependencies( self ): - self.dependencies['binary/ghostscript'] =3D 'default' + self.dependencies['testing/ghosty'] =3D 'default' self.buildDependencies['virtual/base'] =3D 'default' = from Package.CMakePackageBase import *