Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a340d8c6abf89153fa722d959539f01673caf1a3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a340d8c6abf89153fa722d959539f01673caf1a3)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a340d8c6abf89153fa722d959539f01673caf1a3)
  • Date: Tue, 24 Apr 2018 06:26:06 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

CMAKE_FUNCTIONS | 10 ++++
ChangeLog | 3 +
archive-libs/libzip/BUILD | 1
archive-libs/libzip/DETAILS | 1
archive-libs/libzip/HISTORY | 4 +
archive-libs/libzip/INSTALL | 1
graphics-libs/poppler/BUILD | 2
graphics-libs/poppler/DETAILS | 1
graphics-libs/poppler/HISTORY | 4 +
graphics-libs/poppler/INSTALL | 1
graphics-libs/poppler/PRE_BUILD | 4 -
graphics-libs/poppler/patches/0001-bypass-broken-cmake.patch | 24
-----------
libs/re2/BUILD | 2
libs/re2/DETAILS | 1
libs/re2/HISTORY | 4 +
libs/re2/INSTALL | 10 ----
python-pypi/meson/DETAILS | 2
python-pypi/meson/HISTORY | 3 +
18 files changed, 33 insertions(+), 45 deletions(-)

New commits:
commit a340d8c6abf89153fa722d959539f01673caf1a3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

meson: => 0.46.0

commit 65d5d2556c894a6e752340abe1497862926d1b2b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

re2 - simplify cmake usage

commit 9d0d8ef43f098da6ee58614974d85e63bde4f31c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libzip - simplify cmake usage

commit f2a38f190f1358b1606963f6324cb9ec033e7400
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

poppler - simplify cmake usage

commit 8f6c6d760a626568b34a8cca06e818c950c09322
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

add CMAKE_FUNCTIONS

diff --git a/CMAKE_FUNCTIONS b/CMAKE_FUNCTIONS
new file mode 100755
index 0000000..85857fe
--- /dev/null
+++ b/CMAKE_FUNCTIONS
@@ -0,0 +1,10 @@
+PREFIX=${PREFIX:-/usr}
+default_build () {
+ cd $SOURCE_DIRECTORY
+ mkdir -p build
+ OPTS+=" -DBUILD_SHARED_LIBS=1"
+ cmake_build
+}
+default_install () {
+ cmake_install
+}
diff --git a/ChangeLog b/ChangeLog
index a212362..eeaf637 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2018-04-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * CMAKE_FUNCTIONS: added, simplify cmake usage
+
2018-04-19 Treeve Jelbert <treeve AT sourcemage.org>
* kamoso: move to kde5-mm

diff --git a/archive-libs/libzip/BUILD b/archive-libs/libzip/BUILD
deleted file mode 100755
index e013b8d..0000000
--- a/archive-libs/libzip/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-cmake_build
diff --git a/archive-libs/libzip/DETAILS b/archive-libs/libzip/DETAILS
index 07d85a3..149c55c 100755
--- a/archive-libs/libzip/DETAILS
+++ b/archive-libs/libzip/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=libzip
VERSION=1.5.1

SOURCE_HASH=sha512:92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d
diff --git a/archive-libs/libzip/HISTORY b/archive-libs/libzip/HISTORY
index 82f4209..c56775e 100644
--- a/archive-libs/libzip/HISTORY
+++ b/archive-libs/libzip/HISTORY
@@ -1,3 +1,7 @@
+2018-04-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD INSTALL: deleted
+ * DETAILS: simplify cmake usage
+
2018-04-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.1
* DEPENDS: BUILD CONFIGURE INSTALL: now uses cmake
diff --git a/archive-libs/libzip/INSTALL b/archive-libs/libzip/INSTALL
deleted file mode 100755
index 157bcdc..0000000
--- a/archive-libs/libzip/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-cmake_install
diff --git a/graphics-libs/poppler/BUILD b/graphics-libs/poppler/BUILD
index 9af6cbb..cfc58ed 100755
--- a/graphics-libs/poppler/BUILD
+++ b/graphics-libs/poppler/BUILD
@@ -3,4 +3,4 @@ if is_depends_enabled $SPELL qtbase;then
fi &&
export CMAKE_PREFIX_PATH=$QTP &&
OPTS+=" $XPDF_HEADERS -DBUILD_CPP_TESTS=0" &&
-cmake_build
+default_build
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index cd7122b..0b97eb0 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -1,4 +1,5 @@
. "$GRIMOIRE/FUNCTIONS"
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=poppler
if [[ $POPPLER_BRANCH == scm ]]; then
VERSION=$(get_scm_version)
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 54517a2..6ec7b73 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,7 @@
+2018-04-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD INSTALL patches: deleted
+ * BUILD DETAILS: simplify cmake usage
+
2018-04-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.64.0

diff --git a/graphics-libs/poppler/INSTALL b/graphics-libs/poppler/INSTALL
deleted file mode 100755
index 157bcdc..0000000
--- a/graphics-libs/poppler/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-cmake_install
diff --git a/graphics-libs/poppler/PRE_BUILD b/graphics-libs/poppler/PRE_BUILD
deleted file mode 100755
index 1d48c8f..0000000
--- a/graphics-libs/poppler/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-apply_patch_dir patches &&
-sed -i "/SYSTEM/d" test/CMakeLists.txt glib/CMakeLists.txt
diff --git a/graphics-libs/poppler/patches/0001-bypass-broken-cmake.patch
b/graphics-libs/poppler/patches/0001-bypass-broken-cmake.patch
deleted file mode 100644
index 6d09d71..0000000
--- a/graphics-libs/poppler/patches/0001-bypass-broken-cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 024b2472fd71e7fed13b77142b2ca965d6ed65c6 Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Fri, 10 Mar 2017 15:15:23 +0100
-Subject: [PATCH] bypass broken cmake
-
----
- qt5/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt
-index 6bd7a6be..cb7c5574 100644
---- a/qt5/CMakeLists.txt
-+++ b/qt5/CMakeLists.txt
-@@ -1,5 +1,5 @@
- set(CMAKE_AUTOMOC ON)
-
- add_subdirectory(src)
--add_subdirectory(tests)
--add_subdirectory(demos)
-+#add_subdirectory(tests)
-+#add_subdirectory(demos)
---
-2.14.1
-
diff --git a/libs/re2/BUILD b/libs/re2/BUILD
deleted file mode 100755
index c7883a6..0000000
--- a/libs/re2/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-OPTS+="-DBUILD_SHARED_LIBS=1"
-cmake_build
diff --git a/libs/re2/DETAILS b/libs/re2/DETAILS
index 58a8f9e..529f775 100755
--- a/libs/re2/DETAILS
+++ b/libs/re2/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=re2
VERSION=2018-04-01

SOURCE_HASH=sha512:862d9bcb574ea986b1497d6c079104a0cf27b418a6ec8c24047f0d43ede2c8f7f0bdc6a3ccddaeb746f0d821e3e7fd701f438d7fed101db969785c4b344e0462
diff --git a/libs/re2/HISTORY b/libs/re2/HISTORY
index bf308b5..0179554 100644
--- a/libs/re2/HISTORY
+++ b/libs/re2/HISTORY
@@ -1,3 +1,7 @@
+2018-04-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: simplify cnake usage
+ * BUILD INSTALL: deleted
+
2018-04-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2018-04-01

diff --git a/libs/re2/INSTALL b/libs/re2/INSTALL
deleted file mode 100755
index 88c3a79..0000000
--- a/libs/re2/INSTALL
+++ /dev/null
@@ -1,10 +0,0 @@
-cd $SOURCE_DIRECTORY &&
-DEST=$INSTALL_ROOT/usr/include/re2 &&
-mkdir -p $DEST &&
-cp re2/*.h $DEST &&
-DEST=$INSTALL_ROOT/usr/lib &&
-mkdir -p $DEST &&
-cp build/libre2.so $DEST &&
-DEST=$INSTALL_ROOT/usr/lib/pkgconfig &&
-mkdir -p $DEST &&
-cp re2.pc $DEST
diff --git a/python-pypi/meson/DETAILS b/python-pypi/meson/DETAILS
index 3f7779b..adda0eb 100755
--- a/python-pypi/meson/DETAILS
+++ b/python-pypi/meson/DETAILS
@@ -1,5 +1,5 @@
SPELL=meson
- VERSION=0.45.0
+ VERSION=0.46.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=https://github.com/mesonbuild/meson/releases/download/$VERSION/$SOURCE
diff --git a/python-pypi/meson/HISTORY b/python-pypi/meson/HISTORY
index 2fb537f..9bcf039 100644
--- a/python-pypi/meson/HISTORY
+++ b/python-pypi/meson/HISTORY
@@ -1,3 +1,6 @@
+2018-04-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.46.0
+
2018-03-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.45.0



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a340d8c6abf89153fa722d959539f01673caf1a3), Treeve Jelbert, 04/24/2018

Archive powered by MHonArc 2.6.24.

Top of Page