[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [emerge] portage/win32libs/libspectre: fix building libspectre with ghosty
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2015-12-29 0:10:57
Message-ID: E1aDhsP-0001IY-Rk () scm ! kde ! org
[Download RAW message or body]

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 \
libspectre-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.cmake
 --- libspectre-0.2.6.orig/config.h.cmake	1970-01-01 01:00:00.000000000 +0100
 +++ 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.529703600 +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 <= -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 = _spectre_strdup_printf ("%d %d translate\n", -x, -y);
+ 		error = gsapi_run_string_continue (ghostscript_instance, set, strlen (set),
+ 						   0, &exit_code);
+-		error = error == e_NeedInput ? 0 : error;
++		error = error == GS_E(NeedInput) ? 0 : error;
+ 		free (set);
+-		if (error != e_NeedInput && critic_error_code (error)) {
++		if (error != GS_E(NeedInput) && critic_error_code (error)) {
+ 			fclose (fd);
+ 			return FALSE;
+ 		}
+@@ -126,7 +132,7 @@
+ 		read = fread (buf, sizeof (char), to_read, fd);
+ 		error = gsapi_run_string_continue (ghostscript_instance,
+ 						   buf, read, 0, &exit_code);
+-		error = error == e_NeedInput ? 0 : error;
++		error = error == GS_E(NeedInput) ? 0 : error;
+ 		left -= 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] = "libspectre-" + ver
         self.patchToApply["0.2.1"] = ("spectre-0.2.1-cmake.diff", 1)
         self.patchToApply["0.2.6"] = ("libspectre-0.2.6-20101117.diff", 1)
-        self.patchToApply["0.2.7"] = ("libspectre-0.2.7-20131003.diff", 1)
+        self.patchToApply["0.2.7"] = [("libspectre-0.2.7-20131003.diff", 1), \
                ("libspectre-new-ghostscript.diff", 1)]
         self.targetDigests['0.2.6'] = '819475c7e34a1e9bc2e876110fee530b42aecabd'
         self.targetDigests['0.2.7'] = 'a7efd97b82b84ff1bb7a0d88c7e35ad10cc84ea8'
 
@@ -16,7 +16,7 @@ class subinfo(info.infoclass):
         self.defaultTarget = '0.2.7'
 
     def setDependencies( self ):
-        self.dependencies['binary/ghostscript'] = 'default'
+        self.dependencies['testing/ghosty'] = 'default'
         self.buildDependencies['virtual/base'] = 'default'
 
 from Package.CMakePackageBase import *


[prev in list] [next in list] [prev in thread] [next in thread]