sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (4123880088f20b36f38e04211a790ff88b877766)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (4123880088f20b36f38e04211a790ff88b877766)
- Date: Fri, 17 Jan 2025 00:46:07 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
ChangeLog
| 3
cad/brlcad/BUILD
| 2
cad/brlcad/DEPENDS
| 16 ++++
cad/brlcad/DETAILS
| 16 ++++
cad/brlcad/HISTORY
| 34 ++++++++++
cad/brlcad/PRE_BUILD
| 4 +
cad/brlcad/brlcad_WARNING
| 19 +++++
graphics/brlcad/BUILD
| 2
graphics/brlcad/DEPENDS
| 16 ----
graphics/brlcad/DETAILS
| 16 ----
graphics/brlcad/HISTORY
| 34 ----------
graphics/brlcad/PRE_BUILD
| 4 -
graphics/brlcad/brlcad_WARNING
| 19 -----
graphics/inkscape/patches/0001-Future-proof-against-poppler-24.10-changes.patch
| 2
graphics/inkscape/patches/0002-Fix-building-with-Poppler-24.11.patch
| 3
graphics/inkscape/patches/0003-Fix-Poppler-private-includes.patch
| 3
graphics/inkscape/patches/0004-Fix-building-with-poppler-24.12.0.patch
| 3
17 files changed, 105 insertions(+), 91 deletions(-)
New commits:
commit 4123880088f20b36f38e04211a790ff88b877766
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
brlcad: Move to cad section
commit 6d158b8359c99d325b4c59670b627f240f0546e0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
inkscape: Add status of patches
diff --git a/ChangeLog b/ChangeLog
index a4c9792..ef66705 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2025-01-17 Ismael Luceno <ismael AT sourcemage.org>
+ * cad/brlcad: moved from graphics section
+
2025-01-16 Ismael Luceno <ismael AT sourcemage.org>
* cad/kicad: moved from graphics section
diff --git a/cad/brlcad/BUILD b/cad/brlcad/BUILD
new file mode 100755
index 0000000..8ae0c10
--- /dev/null
+++ b/cad/brlcad/BUILD
@@ -0,0 +1,2 @@
+./configure --prefix=${INSTALL_ROOT}/opt/brlcad $OPTS &&
+make
diff --git a/cad/brlcad/DEPENDS b/cad/brlcad/DEPENDS
new file mode 100755
index 0000000..d28e76a
--- /dev/null
+++ b/cad/brlcad/DEPENDS
@@ -0,0 +1,16 @@
+depends bison &&
+depends AWK &&
+depends flex &&
+depends ncurses &&
+optional_depends zlib '--enable-zlib-build' '--disable-zlib-build' 'for
compression support' &&
+optional_depends libpng '--enable-png-build' '--disable-png-build' 'for
png support' &&
+optional_depends X11-LIBS '--with-x' '--without-x' 'for X11 support' &&
+optional_depends OPENGL '--with-ogl' '--without-ogl' 'for OpenGL
support' &&
+optional_depends JDK '--with-jdk' '--without-jdk' 'for rtserver support'
&&
+optional_depends tcl '--with-tcl=/usr/lib' '--without-tcl' 'for tcl
support' &&
+optional_depends tk '--with-tk=/usr/lib' '--without-tk' 'for tk support'
&&
+if is_depends_enabled $SPELL tk; then
+ optional_depends tkhtml3 '--enable-tkhtml-build'
'--disable-tkhtml-build' 'for tkhtml support' &&
+ optional_depends tkimg '--enable-tkpng-build' '--disable-tkpng-build'
'for tkpng support'
+fi &&
+optional_depends docbook-utils '--enable-documentation'
'--disable-documentation' 'install docs?'
diff --git a/cad/brlcad/DETAILS b/cad/brlcad/DETAILS
new file mode 100755
index 0000000..bbb1b0c
--- /dev/null
+++ b/cad/brlcad/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=brlcad
+ VERSION=7.18.2
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:bd99e609794ae17729cc1c71bf9ca9972ef2f265470e9ba18d6a7c10eff3326dfc941396194014f3cbfb1cd6f23cd2439f2b0ce514987dff71852b3a8e43e618
+ WEB_SITE=http://brlcad.org/
+ ENTERED=20050109
+ LICENSE[0]="GPL"
+ SHORT="a constructive solid geometry solid modeling system (CAD)"
+cat << EOF
+BRL-CAD is a powerful constructive solid geometry solid modeling system
+that includes an interactive geometry editor, ray tracing support for
+rendering and geometric analysis, network distributed framebuffer support,
+image and signal-processing tools.
+EOF
diff --git a/cad/brlcad/HISTORY b/cad/brlcad/HISTORY
new file mode 100644
index 0000000..ad1118f
--- /dev/null
+++ b/cad/brlcad/HISTORY
@@ -0,0 +1,34 @@
+2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: remove SOURCEFORGE_URL usage (automated)
+
+2011-04-12 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: made zlib, libpng, OPENGL, and X11-LIBS optional.
+ added missing optional deps on JDK, tcl, tk, tkhtml3, tkimg
+ and docbook-utils.
+
+2011-04-05 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 7.18.2
+ * PRE_BUILD: removed -Werror from CFLAGS to fix build error
+ with gcc 4.6
+
+2010-12-24 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 7.18.0
+
+2008-09-30 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 7.12.4. Removed BUILD_API=2.
+ Switched to SOURCE_HASH. Updated SOURCE_DIRECTORY
+ * brlcad_WARNING: Added. Do not install this with prefix=/usr
+ * BUILD: Added to install in /opt/brlcad
+ * PRE_BUILD: Removed.
+ * config.patch: Removed. Not needed.
+
+2008-08-22 Robert Figura <template AT sourcemage.org>
+ * DETAILS: fixed license
+
+2005-01-15 Richard Johns <johnsr AT lincoln.ac.nz>
+ * DEPENDS: add libpng, zlib as external depends
+ * PRE_BUILD: added, config.patch so config can link to libpng
+ this prevents png build.
+
+2005-01-09 Richard Johns <johnsr AT lincoln.ac.nz>
+ * DETAILS, DEPENDS: created spell
diff --git a/cad/brlcad/PRE_BUILD b/cad/brlcad/PRE_BUILD
new file mode 100755
index 0000000..93653d7
--- /dev/null
+++ b/cad/brlcad/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+sedit 's:-Werror::' configure.ac &&
+./autogen.sh
diff --git a/cad/brlcad/brlcad_WARNING b/cad/brlcad/brlcad_WARNING
new file mode 100644
index 0000000..bcc818f
--- /dev/null
+++ b/cad/brlcad/brlcad_WARNING
@@ -0,0 +1,19 @@
+Below is the warning when configuring brlcad with prefix=/usr. Do not update
+this spell to use that prefix. It will break your system badly
+since it uses library names from glibc.
+
+ }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+WARNING: It is STRONGLY recommended that you DO NOT install BRL-CAD into /usr
+WARNING: as BRL-CAD provides several libraries that may conflict with other
+WARNING: libraries (e.g. librt, libbu, libbn) on certain system
configurations.
+WARNING:
+WARNING: Since our libraries predate all those that we're known to conflict
with
+WARNING: and are at the very core of our geometry services and project
heritage,
+WARNING: we have no plans to change the names of our libraries at this time.
+WARNING:
+WARNING: If you choose to continue installing into /usr, you do so entirely
at
+WARNING: your own risk. You have been warned.
+
+Consider using a different --prefix value.
+
+
diff --git a/graphics/brlcad/BUILD b/graphics/brlcad/BUILD
deleted file mode 100755
index 8ae0c10..0000000
--- a/graphics/brlcad/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-./configure --prefix=${INSTALL_ROOT}/opt/brlcad $OPTS &&
-make
diff --git a/graphics/brlcad/DEPENDS b/graphics/brlcad/DEPENDS
deleted file mode 100755
index d28e76a..0000000
--- a/graphics/brlcad/DEPENDS
+++ /dev/null
@@ -1,16 +0,0 @@
-depends bison &&
-depends AWK &&
-depends flex &&
-depends ncurses &&
-optional_depends zlib '--enable-zlib-build' '--disable-zlib-build' 'for
compression support' &&
-optional_depends libpng '--enable-png-build' '--disable-png-build' 'for
png support' &&
-optional_depends X11-LIBS '--with-x' '--without-x' 'for X11 support' &&
-optional_depends OPENGL '--with-ogl' '--without-ogl' 'for OpenGL
support' &&
-optional_depends JDK '--with-jdk' '--without-jdk' 'for rtserver support'
&&
-optional_depends tcl '--with-tcl=/usr/lib' '--without-tcl' 'for tcl
support' &&
-optional_depends tk '--with-tk=/usr/lib' '--without-tk' 'for tk support'
&&
-if is_depends_enabled $SPELL tk; then
- optional_depends tkhtml3 '--enable-tkhtml-build'
'--disable-tkhtml-build' 'for tkhtml support' &&
- optional_depends tkimg '--enable-tkpng-build' '--disable-tkpng-build'
'for tkpng support'
-fi &&
-optional_depends docbook-utils '--enable-documentation'
'--disable-documentation' 'install docs?'
diff --git a/graphics/brlcad/DETAILS b/graphics/brlcad/DETAILS
deleted file mode 100755
index bbb1b0c..0000000
--- a/graphics/brlcad/DETAILS
+++ /dev/null
@@ -1,16 +0,0 @@
- SPELL=brlcad
- VERSION=7.18.2
- SOURCE=${SPELL}-${VERSION}.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:bd99e609794ae17729cc1c71bf9ca9972ef2f265470e9ba18d6a7c10eff3326dfc941396194014f3cbfb1cd6f23cd2439f2b0ce514987dff71852b3a8e43e618
- WEB_SITE=http://brlcad.org/
- ENTERED=20050109
- LICENSE[0]="GPL"
- SHORT="a constructive solid geometry solid modeling system (CAD)"
-cat << EOF
-BRL-CAD is a powerful constructive solid geometry solid modeling system
-that includes an interactive geometry editor, ray tracing support for
-rendering and geometric analysis, network distributed framebuffer support,
-image and signal-processing tools.
-EOF
diff --git a/graphics/brlcad/HISTORY b/graphics/brlcad/HISTORY
deleted file mode 100644
index ad1118f..0000000
--- a/graphics/brlcad/HISTORY
+++ /dev/null
@@ -1,34 +0,0 @@
-2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
- * DETAILS: remove SOURCEFORGE_URL usage (automated)
-
-2011-04-12 Arjan Bouter <abouter AT sourcemage.org>
- * DEPENDS: made zlib, libpng, OPENGL, and X11-LIBS optional.
- added missing optional deps on JDK, tcl, tk, tkhtml3, tkimg
- and docbook-utils.
-
-2011-04-05 Florian Franzmann <bwlf AT bandrate.org>
- * DETAILS: version 7.18.2
- * PRE_BUILD: removed -Werror from CFLAGS to fix build error
- with gcc 4.6
-
-2010-12-24 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: updated spell to 7.18.0
-
-2008-09-30 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated to version 7.12.4. Removed BUILD_API=2.
- Switched to SOURCE_HASH. Updated SOURCE_DIRECTORY
- * brlcad_WARNING: Added. Do not install this with prefix=/usr
- * BUILD: Added to install in /opt/brlcad
- * PRE_BUILD: Removed.
- * config.patch: Removed. Not needed.
-
-2008-08-22 Robert Figura <template AT sourcemage.org>
- * DETAILS: fixed license
-
-2005-01-15 Richard Johns <johnsr AT lincoln.ac.nz>
- * DEPENDS: add libpng, zlib as external depends
- * PRE_BUILD: added, config.patch so config can link to libpng
- this prevents png build.
-
-2005-01-09 Richard Johns <johnsr AT lincoln.ac.nz>
- * DETAILS, DEPENDS: created spell
diff --git a/graphics/brlcad/PRE_BUILD b/graphics/brlcad/PRE_BUILD
deleted file mode 100755
index 93653d7..0000000
--- a/graphics/brlcad/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-sedit 's:-Werror::' configure.ac &&
-./autogen.sh
diff --git a/graphics/brlcad/brlcad_WARNING b/graphics/brlcad/brlcad_WARNING
deleted file mode 100644
index bcc818f..0000000
--- a/graphics/brlcad/brlcad_WARNING
+++ /dev/null
@@ -1,19 +0,0 @@
-Below is the warning when configuring brlcad with prefix=/usr. Do not update
-this spell to use that prefix. It will break your system badly
-since it uses library names from glibc.
-
- }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
-WARNING: It is STRONGLY recommended that you DO NOT install BRL-CAD into /usr
-WARNING: as BRL-CAD provides several libraries that may conflict with other
-WARNING: libraries (e.g. librt, libbu, libbn) on certain system
configurations.
-WARNING:
-WARNING: Since our libraries predate all those that we're known to conflict
with
-WARNING: and are at the very core of our geometry services and project
heritage,
-WARNING: we have no plans to change the names of our libraries at this time.
-WARNING:
-WARNING: If you choose to continue installing into /usr, you do so entirely
at
-WARNING: your own risk. You have been warned.
-
-Consider using a different --prefix value.
-
-
diff --git
a/graphics/inkscape/patches/0001-Future-proof-against-poppler-24.10-changes.patch
b/graphics/inkscape/patches/0001-Future-proof-against-poppler-24.10-changes.patch
index a6db7dc..c069116 100644
---
a/graphics/inkscape/patches/0001-Future-proof-against-poppler-24.10-changes.patch
+++
b/graphics/inkscape/patches/0001-Future-proof-against-poppler-24.10-changes.patch
@@ -3,6 +3,8 @@ From: PBS <pbs3141 AT gmail.com>
Date: Tue, 22 Oct 2024 14:48:31 +0100
Subject: [PATCH 1/4] Future-proof against poppler 24.10 changes
+Upstream-Status: Backport
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
---
.../internal/pdfinput/pdf-parser.cpp | 120 ++++++++----------
src/extension/internal/pdfinput/pdf-parser.h | 4 +-
diff --git
a/graphics/inkscape/patches/0002-Fix-building-with-Poppler-24.11.patch
b/graphics/inkscape/patches/0002-Fix-building-with-Poppler-24.11.patch
index 7f5be57..355d8e1 100644
--- a/graphics/inkscape/patches/0002-Fix-building-with-Poppler-24.11.patch
+++ b/graphics/inkscape/patches/0002-Fix-building-with-Poppler-24.11.patch
@@ -10,6 +10,9 @@ on our end instead.
Fixes https://gitlab.com/inkscape/inkscape/-/issues/5370
[1]
https://gitlab.freedesktop.org/poppler/poppler/-/commit/94467509a013dd5cf46c942baa598f2b296571f4
+
+Upstream-Status: Backport
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
---
.../internal/pdfinput/poppler-cairo-font-engine.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
a/graphics/inkscape/patches/0003-Fix-Poppler-private-includes.patch
b/graphics/inkscape/patches/0003-Fix-Poppler-private-includes.patch
index 985f968..1430ab4 100644
--- a/graphics/inkscape/patches/0003-Fix-Poppler-private-includes.patch
+++ b/graphics/inkscape/patches/0003-Fix-Poppler-private-includes.patch
@@ -9,6 +9,9 @@ done in other places in the code which need Poppler's private
headers.
This fixes build against Poppler installed at a custom path.
+
+Upstream-Status: Backport
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
---
src/extension/internal/pdfinput/pdf-parser.h | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git
a/graphics/inkscape/patches/0004-Fix-building-with-poppler-24.12.0.patch
b/graphics/inkscape/patches/0004-Fix-building-with-poppler-24.12.0.patch
index c0e77d9..4fcf16b 100644
--- a/graphics/inkscape/patches/0004-Fix-building-with-poppler-24.12.0.patch
+++ b/graphics/inkscape/patches/0004-Fix-building-with-poppler-24.12.0.patch
@@ -4,6 +4,9 @@ Date: Thu, 5 Dec 2024 15:03:47 +0100
Subject: [PATCH 4/4] Fix building with poppler 24.12.0
Fixes https://gitlab.com/inkscape/inkscape/-/issues/5415
+
+Upstream-Status: Backport
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
---
src/extension/internal/pdfinput/pdf-parser.cpp | 4 +++-
src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
- [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (4123880088f20b36f38e04211a790ff88b877766), Ismael Luceno, 01/16/2025
Archive powered by MHonArc 2.6.24.