Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (412d31105eeb442a5f18b08d82a00604b4774397)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (412d31105eeb442a5f18b08d82a00604b4774397)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (412d31105eeb442a5f18b08d82a00604b4774397)
  • Date: Fri, 15 May 2020 21:09:52 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

ChangeLog | 4 +
devel/android-tools/0001-add-missing-includes.patch | 46
--------------------
devel/android-tools/BUILD | 3 -
devel/android-tools/CONFIGURE | 1
devel/android-tools/DEPENDS | 8 +++
devel/android-tools/DETAILS | 18 +++----
devel/android-tools/HISTORY | 4 +
devel/android-tools/INSTALL | 6 --
devel/android-tools/PRE_BUILD | 26 -----------
devel/googletest/BUILD | 1
devel/googletest/CONFIGURE | 1
devel/googletest/DEPENDS | 2
devel/googletest/DETAILS | 22 +++++++++
devel/googletest/HISTORY | 2
devel/googletest/INSTALL | 1
15 files changed, 54 insertions(+), 91 deletions(-)

New commits:
commit 412d31105eeb442a5f18b08d82a00604b4774397
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

android-tools 29.0.6

commit 6bc65e1e871d5203f40ac0925b755044287f46ee
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

googletest: new spell, Google's C++ tests framework

diff --git a/ChangeLog b/ChangeLog
index f5661aa..dddbfdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-05-15 Ismael Luceno <ismael AT sourcemage.org>
+ * devel/googletest: new spell, Google's framework for writing C++
+ tests
+
2020-05-14 Ismael Luceno <ismael AT sourcemage.org>
* devel/ccl: new spell, Clozure Common Lisp interpreter and compiler

diff --git a/devel/android-tools/0001-add-missing-includes.patch
b/devel/android-tools/0001-add-missing-includes.patch
deleted file mode 100644
index 0d1feaa..0000000
--- a/devel/android-tools/0001-add-missing-includes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 36b2fa39896e82da001125d4f447b739f3f3bbb2 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Wed, 15 Aug 2018 15:00:31 +0200
-Subject: [PATCH] add missing includes
-
----
- core-98d0789/adb/usb_linux.c | 1 +
- core-98d0789/fastboot/usb_linux.c | 3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/core-98d0789/adb/usb_linux.c b/core-98d0789/adb/usb_linux.c
-index 7bf2057..7d8d6b5 100644
---- a/core-98d0789/adb/usb_linux.c
-+++ b/core-98d0789/adb/usb_linux.c
-@@ -22,6 +22,7 @@
- #include <sys/ioctl.h>
- #include <sys/types.h>
- #include <sys/time.h>
-+#include <sys/sysmacros.h>
- #include <dirent.h>
- #include <fcntl.h>
- #include <errno.h>
-diff --git a/core-98d0789/fastboot/usb_linux.c
b/core-98d0789/fastboot/usb_linux.c
-index b7a9ca3..39e7be1 100644
---- a/core-98d0789/fastboot/usb_linux.c
-+++ b/core-98d0789/fastboot/usb_linux.c
-@@ -34,6 +34,7 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <dirent.h>
- #include <fcntl.h>
- #include <errno.h>
-@@ -108,7 +109,7 @@ static int filter_usb_device(int fd, char *ptr, int len,
int writable,
- int in, out;
- unsigned i;
- unsigned e;
--
-+
- struct stat st;
- int result;
-
---
-2.18.0
-
diff --git a/devel/android-tools/BUILD b/devel/android-tools/BUILD
index db2797d..e013b8d 100755
--- a/devel/android-tools/BUILD
+++ b/devel/android-tools/BUILD
@@ -1,2 +1 @@
-cd ${SOURCE_DIRECTORY}/core-${XHASH} &&
-default_build_make
+cmake_build
diff --git a/devel/android-tools/CONFIGURE b/devel/android-tools/CONFIGURE
new file mode 100755
index 0000000..b1e2770
--- /dev/null
+++ b/devel/android-tools/CONFIGURE
@@ -0,0 +1 @@
+. "$GRIMOIRE"/CMAKE_CONFIGURE
diff --git a/devel/android-tools/DEPENDS b/devel/android-tools/DEPENDS
index 715416f..07f44a7 100755
--- a/devel/android-tools/DEPENDS
+++ b/devel/android-tools/DEPENDS
@@ -1,3 +1,9 @@
+. "$GRIMOIRE"/CMAKE_DEPENDS &&
depends zlib &&
depends SSL &&
-depends libarchive
+depends libusb &&
+depends pcre2 &&
+
+# for bundled boringssl
+depends go &&
+depends googletest
diff --git a/devel/android-tools/DETAILS b/devel/android-tools/DETAILS
index 0bc591f..848cdc6 100755
--- a/devel/android-tools/DETAILS
+++ b/devel/android-tools/DETAILS
@@ -1,15 +1,11 @@
SPELL=android-tools
- XDATE=20130123
- XVERSION=3.fc21
- XHASH=98d0789
- XEXTRAS_HASH=4ff85ad
- VERSION=${XDATE}git${XHASH}-${XVERSION}
- SOURCE="${SPELL}-${VERSION}.src.rpm"
-
SOURCE_URL[0]=http://kojipkgs.fedoraproject.org/packages/${SPELL}/${XDATE}git${XHASH}/${XVERSION}/src/${SOURCE}
-
SOURCE_HASH=sha512:09f9a8a56f8c32d1e385fd9f7f7aa6eeec6928f11c46ce371f29fae8e656633f669e62b6a8860c020bd92414742c5a245eb55f4ae3588fd30c68da0cc97d40ea
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="https://android.googlesource.com/platform/system/core.git/";
- LICENSE[0]=BSD
+ VERSION=29.0.6
+ SOURCE="$SPELL-$VERSION.tar.xz"
+
SOURCE_URL=("https://github.com/nmeum/$SPELL/releases/download/$VERSION/$SOURCE";)
+
SOURCE_HASH=sha512:35f9eed7d67e726ba549cfd7b662308aaa86a595f93cbc30c59b371df7784931062e271c78ade2a0b51c3433e12ec4d141b70f1738625ab3af026ba278b9e612
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="http://developer.android.com/tools/help/adb.html";
+ LICENSE=(Apache-2.0 ISC GPL-2.0-only MIT)
ENTERED=20140622
SHORT="tools for developing android based devices"
cat << EOF
diff --git a/devel/android-tools/HISTORY b/devel/android-tools/HISTORY
index 6c3bb4c..ff1c897 100644
--- a/devel/android-tools/HISTORY
+++ b/devel/android-tools/HISTORY
@@ -1,3 +1,7 @@
+2020-05-15 Ismael Luceno <ismael AT iodev.co.uk>
+ * BUILD, DEPENDS, DETAILS, INSTALL, CONFIGURE: updated spell to 29.0.6
+ * 0001-add-missing-includes.patch, PRE_BUILD: removed, no longer
needed
+
2018-08-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, 0001-add-missing-includes.patch: fix error during linking

diff --git a/devel/android-tools/INSTALL b/devel/android-tools/INSTALL
index 2b64d9c..157bcdc 100755
--- a/devel/android-tools/INSTALL
+++ b/devel/android-tools/INSTALL
@@ -1,5 +1 @@
-install -m755 -o root -g root ${SOURCE_DIRECTORY}/core-${XHASH}/adb/adb
${INSTALL_ROOT}/usr/bin &&
-install -m755 -o root -g root
${SOURCE_DIRECTORY}/core-${XHASH}/fastboot/fastboot ${INSTALL_ROOT}/usr/bin &&
-mkdir -p ${INSTALL_ROOT}/usr/share/doc/${SPELL} &&
-install -m644 -o root -g root
${SOURCE_DIRECTORY}/core-${XHASH}/adb/{OVERVIEW,SERVICES}.TXT
${INSTALL_ROOT}/usr/share/doc/${SPELL} &&
-install -m644 -o root -g root ${SOURCE_DIRECTORY}/51-android.rules
${INSTALL_ROOT}/etc/udev/rules.d
+cmake_install
diff --git a/devel/android-tools/PRE_BUILD b/devel/android-tools/PRE_BUILD
deleted file mode 100755
index 30e57d5..0000000
--- a/devel/android-tools/PRE_BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-mk_source_dir &&
-cd ${SOURCE_DIRECTORY} &&
-bsdtar xvf ${SOURCE_CACHE}/${SOURCE} &&
-
-bsdtar xf core-${XHASH}.tar.xz &&
-bsdtar xf extras-${XEXTRAS_HASH}.tar.xz &&
-
-patch -p1 < "$SPELL_DIRECTORY/0001-add-missing-includes.patch"
-
-cd ${SOURCE_DIRECTORY}/core-${XHASH} &&
-
-mv ../core-Makefile Makefile &&
-mv ../adb-Makefile adb/Makefile &&
-mv ../fastboot-Makefile fastboot/Makefile &&
-
-# Avoid libselinux dependency.
-sed -e 's: -lselinux::' -i fastboot/Makefile &&
-sed -e '/#include <selinux\/selinux.h>/d' \
- -e 's:#include <selinux/label.h>:struct selabel_handle;:' \
- -i ../extras/ext4_utils/make_ext4fs.h &&
-sed -e '160,174d;434,455d' -i ../extras/ext4_utils/make_ext4fs.c &&
-
-if ! spell_ok systemd; then
- sedit 's:, TAG+="systemd", ENV{SYSTEMD_WANTS}="adb.service":, MODE="0664",
GROUP="plugdev":' ${SOURCE_DIRECTORY}/51-android.rules
-fi
-
diff --git a/devel/googletest/BUILD b/devel/googletest/BUILD
new file mode 100755
index 0000000..e013b8d
--- /dev/null
+++ b/devel/googletest/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/devel/googletest/CONFIGURE b/devel/googletest/CONFIGURE
new file mode 100755
index 0000000..b1e2770
--- /dev/null
+++ b/devel/googletest/CONFIGURE
@@ -0,0 +1 @@
+. "$GRIMOIRE"/CMAKE_CONFIGURE
diff --git a/devel/googletest/DEPENDS b/devel/googletest/DEPENDS
new file mode 100755
index 0000000..7fbae08
--- /dev/null
+++ b/devel/googletest/DEPENDS
@@ -0,0 +1,2 @@
+. "$GRIMOIRE"/CMAKE_DEPENDS &&
+depends PYTHON
diff --git a/devel/googletest/DETAILS b/devel/googletest/DETAILS
new file mode 100755
index 0000000..fb8f2f2
--- /dev/null
+++ b/devel/googletest/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=googletest
+ VERSION=1.8.1
+ SOURCE="$SPELL-release-$VERSION.tar.gz"
+
SOURCE_URL[0]="https://github.com/google/$SPELL/archive/release-$VERSION.tar.gz";
+
SOURCE_HASH=sha512:e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SOURCE%.tar.gz}"
+ WEB_SITE="https://github.com/google/googletest";
+ LICENSE[0]="BSD-3-Clause"
+ ENTERED=20200515
+ KEYWORDS=""
+ SHORT="Google's framework for writing C++ tests"
+cat << EOF
+Google Test is a framework for writing C++ tests on a variety of platforms.
+Based on the xUnit architecture. Supports automatic test discovery, a rich
+set of assertions, user-defined assertions, death tests, fatal and non-fatal
+failures, value- and type-parameterized tests, various options for running
+the tests, and XML test report generation.
+
+Google Mock is an extension of Google Test for C++ mocking. Inspired by
+jMock, EasyMock, and Hamcrest, and designed with C++'s specifics in mind,
+it can help you derive better designs of your system and write better tests.
+EOF
diff --git a/devel/googletest/HISTORY b/devel/googletest/HISTORY
new file mode 100644
index 0000000..c985d6a
--- /dev/null
+++ b/devel/googletest/HISTORY
@@ -0,0 +1,2 @@
+2020-05-15 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS, INSTALL: spell created
diff --git a/devel/googletest/INSTALL b/devel/googletest/INSTALL
new file mode 100755
index 0000000..157bcdc
--- /dev/null
+++ b/devel/googletest/INSTALL
@@ -0,0 +1 @@
+cmake_install


  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (412d31105eeb442a5f18b08d82a00604b4774397), Ismael Luceno, 05/15/2020

Archive powered by MHonArc 2.6.24.

Top of Page