Bghostview x86 64 + debug targets for ghostscript_gpl-9.55 (#6756)

This commit is contained in:
Anarchos
2022-03-28 14:22:51 +02:00
committed by GitHub
parent e5d771d947
commit 4450afddb8
4 changed files with 135 additions and 13 deletions

View File

@@ -144,15 +144,14 @@ BUILD()
--with-fontpath="$FONTPATH"
# Do make
make $jobArgs
make so $jobArgs
make debug $jobArgs
make sodebug $jobArgs
}
INSTALL()
{
make install
make soinstall
make install-sodebug
prepareInstalledDevelLib libgs
packageEntries devel $developDir
}

View File

@@ -1,4 +1,4 @@
From 008478bcb5c92fe6aed69bdf72d03c43ec2bc0f3 Mon Sep 17 00:00:00 2001
From 8ab80356e68c1e5f736cabcaeebf8a3fd6cafd33 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 10 Mar 2019 13:45:11 +0100
Subject: Fix build on x86 32bit
@@ -22,7 +22,7 @@ index 42a5c0a..786787d 100644
2.30.2
From 903fed9a037d4dc657bbad5cc5e736c5486b87f8 Mon Sep 17 00:00:00 2001
From b09459e2b67a33afd41e2eedc1e0669827ce1d71 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 13 Mar 2019 21:14:28 +0100
Subject: fix building shared libs
@@ -45,7 +45,7 @@ index 36b51f5..3312477 100644
2.30.2
From 707b3100cb524d61e79ff831079005d6802d4fd1 Mon Sep 17 00:00:00 2001
From 4214bf13e1f71c537d824f99a9a5d57f59f36109 Mon Sep 17 00:00:00 2001
From: Robin Watts <Robin.Watts@artifex.com>
Date: Fri, 1 Oct 2021 12:44:44 +0100
Subject: Bug 704405: Fix typo in non-forked lcms2 code.
@@ -68,7 +68,7 @@ index ccf1d70..9badb6d 100644
2.30.2
From fc56e5e82ce262d1b885fca13a6f00090e6735f9 Mon Sep 17 00:00:00 2001
From e0caa4b053c8877375ecce1850f977f81f82571d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sun, 31 Oct 2021 22:03:15 +0100
Subject: fix looking for dlopen in libdl only
@@ -92,3 +92,97 @@ index 3312477..f627cbf 100644
--
2.30.2
From 77e1d546ecdd50d42681611cfe614db60aa6c5ff Mon Sep 17 00:00:00 2001
From: Anarchos <sylvain_kerjean@hotmail.com>
Date: Wed, 2 Mar 2022 21:15:32 +0100
Subject: debug flags for haiku
diff --git a/configure.ac b/configure.ac
index f627cbf..d6563de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -284,7 +284,7 @@ SET_DT_SONAME="-soname="
CFLAGS_LARGEFILE=""
case $host in
- *-linux*|*-gnu)
+ *-linux*|*-gnu|*-haiku)
if test $GCC = yes; then
CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG"
CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0"
--
2.30.2
From 41b392e739aa16d943788b3a889d8a438efd1459 Mon Sep 17 00:00:00 2001
From: Anarchos <sylvain_kerjean@hotmail.com>
Date: Fri, 4 Mar 2022 05:47:01 +0100
Subject: -g
diff --git a/configure.ac b/configure.ac
index d6563de..d682a97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,7 +287,7 @@ case $host in
*-linux*|*-gnu|*-haiku)
if test $GCC = yes; then
CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG"
- CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0"
+ CC_DBG_FLAGS_TO_TRY="-g"
CC_VISIBILITY_FLAGS_TO_TRY="-fvisibility=hidden"
fi
;;
--
2.30.2
From 8fd422a85278e54141866273a61d3eeb0d2245b1 Mon Sep 17 00:00:00 2001
From: Anarchos <sylvain_kerjean@hotmail.com>
Date: Thu, 10 Mar 2022 17:11:47 +0100
Subject: debug flags
diff --git a/base/unix-dll.mak b/base/unix-dll.mak
index e83390c..3bb6c34 100644
--- a/base/unix-dll.mak
+++ b/base/unix-dll.mak
@@ -427,7 +427,8 @@ soinstall:
$(MAKE) $(SUB_MAKE_OPTION) soinstall-subtarget BUILDDIRPREFIX=$(SODIRPREFIX)
sodebuginstall:
- $(MAKE) $(SUB_MAKE_OPTION) soinstall-subtarget GENOPT='-DDEBUG' BUILDDIRPREFIX=$(SODEBUGDIRPREFIX)
+ GENOPT='-DDEBUG -g'
+ $(MAKE) $(SUB_MAKE_OPTION) soinstall-subtarget GENOPT='$(GENOPT)' BUILDDIRPREFIX=$(SODEBUGDIRPREFIX)
soinstall-subtarget: install-so install-scripts install-data $(INSTALL_SHARED) $(INSTALL_CONTRIB)
--
2.30.2
From 09c8866d8568070e6620599e9faaece0577faf3a Mon Sep 17 00:00:00 2001
From: Anarchos <sylvain_kerjean@hotmail.com>
Date: Thu, 10 Mar 2022 21:44:39 +0100
Subject: revert
diff --git a/base/unix-dll.mak b/base/unix-dll.mak
index 3bb6c34..e83390c 100644
--- a/base/unix-dll.mak
+++ b/base/unix-dll.mak
@@ -427,8 +427,7 @@ soinstall:
$(MAKE) $(SUB_MAKE_OPTION) soinstall-subtarget BUILDDIRPREFIX=$(SODIRPREFIX)
sodebuginstall:
- GENOPT='-DDEBUG -g'
- $(MAKE) $(SUB_MAKE_OPTION) soinstall-subtarget GENOPT='$(GENOPT)' BUILDDIRPREFIX=$(SODEBUGDIRPREFIX)
+ $(MAKE) $(SUB_MAKE_OPTION) soinstall-subtarget GENOPT='-DDEBUG' BUILDDIRPREFIX=$(SODEBUGDIRPREFIX)
soinstall-subtarget: install-so install-scripts install-data $(INSTALL_SHARED) $(INSTALL_CONTRIB)
--
2.30.2

View File

@@ -14,7 +14,6 @@ CHECKSUM_SHA256="5383b43134b324d13d15d4851010925c572fb5db330bb6d296210d415e796e6
SOURCE_FILENAME="bghostview-$srcGitRev.tar.gz"
SOURCE_DIR="BGhostView-$srcGitRev/src"
PATCHES="bghostview-$portVersion.patchset"
ARCHITECTURES="?all !x86_gcc2 x86_64"
SECONDARY_ARCHITECTURES="x86"

View File

@@ -1,7 +1,7 @@
From 41d3a5a68b3c69fe340a6395948ba2f1c603479d Mon Sep 17 00:00:00 2001
From 4bed13fc880d56c18c11a66dab9682730c8cf1b2 Mon Sep 17 00:00:00 2001
From: Anarchos <sylvain_kerjean@hotmail.com>
Date: Sun, 27 Feb 2022 22:00:35 +0100
Subject: build also on x86_64
Date: Mon, 28 Feb 2022 14:19:31 +0100
Subject: compiling for x86_64
diff --git a/BGhostview.cpp b/BGhostview.cpp
@@ -27,7 +27,7 @@ index 6893be5..bab63ea 100644
};
if (doc!=NULL) psfree( doc );
diff --git a/BPSWidget.cpp b/BPSWidget.cpp
index 474b74d..e04ba81 100644
index 474b74d..0c7ac5d 100644
--- a/BPSWidget.cpp
+++ b/BPSWidget.cpp
@@ -220,7 +220,7 @@ int gsapi_stderr(void *caller_handle, const char *str, int len)
@@ -55,3 +55,33 @@ index 7d95440..f502a4d 100644
--
2.30.2
From 4a9023a46328765bbb7638862f5862efcbf1ee53 Mon Sep 17 00:00:00 2001
From: Anarchos <sylvain_kerjean@hotmail.com>
Date: Mon, 28 Feb 2022 14:32:45 +0100
Subject: compiling for x86_64
diff --git a/BGhostview.cpp b/BGhostview.cpp
index bab63ea..2df823d 100644
--- a/BGhostview.cpp
+++ b/BGhostview.cpp
@@ -45,15 +45,13 @@ BGhostview::BGhostview( BRect frame, const char *name )
strcpy(psTmp,"/boot/apps/Ghostscript/");
}
else {
- BEntry entry(&info.ref);
- BPath path;
- entry.GetPath(&path);
- path.GetParent(&path);
+ BPath path;
tempDir=new char[B_PATH_NAME_LENGTH];
+ find_directory(B_SYSTEM_TEMP_DIRECTORY, &path);
strcpy(tempDir,path.Path());
strcpy(psTmp,tempDir);
strcat(psTmp,"/");
- };
+ };
BView *menuBar=createMenubar(BRect(0,0,0,0));
AddChild(menuBar);
toolBar = (AToolBar *)createToolbar(BRect(0,menuBar->Bounds().Height()+1,frame.Width(),25));