Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

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 (e545d4a1627f7f2e66685fb270e02b9c97d07265)
  • Date: Mon, 23 Nov 2015 08:43:08 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

graphics-libs/sane-backends/DEPENDS | 2 -
graphics-libs/sane-backends/DETAILS | 8 ++---
graphics-libs/sane-backends/HISTORY | 5 +++
graphics-libs/sane-backends/PRE_BUILD | 4 --
graphics-libs/sane-backends/libv4l.patch | 45
-------------------------------
libs/apr/DETAILS | 2 -
libs/apr/HISTORY | 3 ++
qt5-cmake/sddm/HISTORY | 4 ++
qt5-cmake/sddm/PRE_BUILD | 5 ---
qt5-cmake/sddm/sddm.conf | 8 +++++
security/nmap/DEPENDS | 7 ++++
security/nmap/DETAILS | 4 +-
security/nmap/HISTORY | 4 ++
13 files changed, 39 insertions(+), 62 deletions(-)

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

nmap: => 7.00

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

apr: => 1.5.2

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

sane-backends: => 1.0.25

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

sddm - improve sddm.conf

diff --git a/graphics-libs/sane-backends/DEPENDS
b/graphics-libs/sane-backends/DEPENDS
index 1c15ed5..4c2475d 100755
--- a/graphics-libs/sane-backends/DEPENDS
+++ b/graphics-libs/sane-backends/DEPENDS
@@ -1,7 +1,7 @@
depends JPEG &&
depends tiff &&

-optional_depends LIBUSB \
+optional_depends libusb \
"--enable-libusb" \
"--disable-libusb" \
"Enable libusb support" &&
diff --git a/graphics-libs/sane-backends/DETAILS
b/graphics-libs/sane-backends/DETAILS
index b92ded3..7811459 100755
--- a/graphics-libs/sane-backends/DETAILS
+++ b/graphics-libs/sane-backends/DETAILS
@@ -1,11 +1,11 @@
SPELL=sane-backends
- VERSION=1.0.22
-
SOURCE_HASH=sha512:26ed793bbb4110a7b8bc9c3b22dbc125ba1bb5f7ff89545542ec9cae9c641351e7d420d3f53982e2c6d63577a4c90b24a8f4d6b748be65c98284123f778fcba1
+ VERSION=1.0.25
+
SOURCE_HASH=sha512:b9548646fff13558a4da4a4e9e8bad730f05121bcc65b72d24ded3bfddc6fe574e08c39c8651544b8fbfeab036fffd76cc14d76ef5d5d47e7513a2ce3afcc9df
# PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.sane-project.org/pub/sane/$SPELL-$VERSION/$SOURCE
- SOURCE_URL[1]=http://alioth.debian.org/download.php/3503/$SOURCE
+# SOURCE_URL[0]=ftp://ftp.sane-project.org/pub/sane/$SPELL-$VERSION/$SOURCE
+ SOURCE_URL[0]=https://alioth.debian.org/frs/download.php/file/4146/$SOURCE
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
LICENSE[0]=GPL
WEB_SITE=http://www.sane-project.org/
diff --git a/graphics-libs/sane-backends/HISTORY
b/graphics-libs/sane-backends/HISTORY
index a42d588..84553f2 100644
--- a/graphics-libs/sane-backends/HISTORY
+++ b/graphics-libs/sane-backends/HISTORY
@@ -1,3 +1,8 @@
+2015-11-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.25
+ * PRE_BUILD libv4l.patch: deleted
+ * DEPENDS: LIBUSB -> libusb
+
2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libusb => LIBUSB

diff --git a/graphics-libs/sane-backends/PRE_BUILD
b/graphics-libs/sane-backends/PRE_BUILD
deleted file mode 100755
index a34cef7..0000000
--- a/graphics-libs/sane-backends/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 < "$SPELL_DIRECTORY/libv4l.patch"
diff --git a/graphics-libs/sane-backends/libv4l.patch
b/graphics-libs/sane-backends/libv4l.patch
deleted file mode 100644
index 91781d7..0000000
--- a/graphics-libs/sane-backends/libv4l.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From c5ca46c2d1be78c651afb843cc834cf2b5b24953 Mon Sep 17 00:00:00 2001
-From: Julien BLACHE <jb AT jblache.org>
-Date: Wed, 16 Feb 2011 19:37:43 +0100
-Subject: [PATCH] Fix v4l build with libv4l 0.8.3+
-
----
-diff --git a/backend/v4l.c b/backend/v4l.c
-index 6510ef0..38595ed 100644
---- a/backend/v4l.c
-+++ b/backend/v4l.c
-@@ -84,9 +84,8 @@
- #include "../include/sane/sanei_config.h"
- #define V4L_CONFIG_FILE "v4l.conf"
-
--#include "v4l.h"
--
- #include <libv4l1.h>
-+#include "v4l.h"
-
- static const SANE_Device **devlist = NULL;
- static int num_devices;
-diff --git a/backend/v4l.h b/backend/v4l.h
-index 588b96e..6aee586 100644
---- a/backend/v4l.h
-+++ b/backend/v4l.h
-@@ -29,6 +29,7 @@
- #ifndef v4l_h
- #define v4l_h
-
-+#ifndef __LINUX_VIDEODEV_H
- /* Kernel interface */
- /* Only the stuff we need. For more features, more defines are needed */
-
-@@ -165,7 +166,7 @@ struct video_channel
-
-
- /* end of kernel interface */
--
-+#endif /* !__LINUX_VIDEODEV_H */
-
- #include <../include/sane/sane.h>
-
---
-1.7.2.5
-
diff --git a/libs/apr/DETAILS b/libs/apr/DETAILS
index 53673b5..c8b3c08 100755
--- a/libs/apr/DETAILS
+++ b/libs/apr/DETAILS
@@ -1,5 +1,5 @@
SPELL=apr
- VERSION=1.5.0
+ VERSION=1.5.2
SECURITY_PATCH=2
REPOS_URI="branches/${VERSION%.*}.x"
# APR_LATEST replaces APR_CVS; remove APR_CVS in May, 2005
diff --git a/libs/apr/HISTORY b/libs/apr/HISTORY
index 6af4cd7..18d562f 100644
--- a/libs/apr/HISTORY
+++ b/libs/apr/HISTORY
@@ -1,3 +1,6 @@
+20115-11-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.2
+
2014-01-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.0

diff --git a/qt5-cmake/sddm/HISTORY b/qt5-cmake/sddm/HISTORY
index 2650cb8..c7550b8 100644
--- a/qt5-cmake/sddm/HISTORY
+++ b/qt5-cmake/sddm/HISTORY
@@ -1,3 +1,7 @@
+2015-11-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: do not patch
+ * sddm.conf: improve
+
2015-11-08 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: fix typo

diff --git a/qt5-cmake/sddm/PRE_BUILD b/qt5-cmake/sddm/PRE_BUILD
index 27eeba5..351cea5 100755
--- a/qt5-cmake/sddm/PRE_BUILD
+++ b/qt5-cmake/sddm/PRE_BUILD
@@ -5,7 +5,4 @@ if `! grep ^video:.*sddm /etc/group > /dev/null`;then
sed -i '/video:/s/$/,sddm/' /etc/group
fi &&
# sddm wants home directory = /var/lib/sddm
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# fix shutdown/reboot commands
-sed -i '/HALT/s/-h -P/-hq/;/REBOOT/s/-r/-rq/' CMakeLists.txt
+default_pre_build
diff --git a/qt5-cmake/sddm/sddm.conf b/qt5-cmake/sddm/sddm.conf
index c98ddc8..f85d1e7 100644
--- a/qt5-cmake/sddm/sddm.conf
+++ b/qt5-cmake/sddm/sddm.conf
@@ -1,6 +1,14 @@
[General]
AutoRelogin=false
AutoUser=
+HaltCommand='/sbin/shutdown -hq now'
+RebootCommand='/sbin/shutdown -rq now'
[Theme]
Current=maldives
CursorTheme=
+[XDisplay]
+SessionDir=/opt/qt5/share/xsessions
+#/usr/share/xsessions
+[WaylandDisplay]
+SessionDir=/opt/qt5/share/wayland-sessions
+#/usr/share/wayland-sessions
diff --git a/security/nmap/DEPENDS b/security/nmap/DEPENDS
index 13b0ada..cd5bd8f 100755
--- a/security/nmap/DEPENDS
+++ b/security/nmap/DEPENDS
@@ -32,4 +32,9 @@ optional_depends pcre \
optional_depends lua51 \
"--with-liblua=$INSTALL_ROOT/usr" \
"--with-liblua=included" \
- "use external Lua lib?"
+ "use external Lua lib?" &&
+
+optional_depends subversion \
+ "--with-nmap-update" \
+ "--without-nmap-update" \
+ "build namp_update"
diff --git a/security/nmap/DETAILS b/security/nmap/DETAILS
index 0f91cc8..13740fa 100755
--- a/security/nmap/DETAILS
+++ b/security/nmap/DETAILS
@@ -1,5 +1,6 @@
SPELL=nmap
- VERSION=6.47
+ VERSION=7.00
+
SOURCE_HASH=sha512:f8b4368de5956698e76a2a102102feb4bd00338cf983bfbf7bcd8c941288bb4a02c45469724e8a1daed87f41536a3f16a68fc604171fe23093575ac631637351
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
@@ -9,7 +10,6 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_URL[1]=http://sectools.org/nmap/sigs/$SOURCE2
# SOURCE_GPG=nmap.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
-
SOURCE_HASH=sha512:f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296
WEB_SITE=http://nmap.org/
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY
index aa3d2d8..b10fbfd 100644
--- a/security/nmap/HISTORY
+++ b/security/nmap/HISTORY
@@ -1,3 +1,7 @@
+2015-11-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 7.00
+ * DEPNDS: add optional subversion
+
2015-11-11 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: ncat will not build against lua, only lua51



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e545d4a1627f7f2e66685fb270e02b9c97d07265), Treeve Jelbert, 11/23/2015

Archive powered by MHonArc 2.6.24.

Top of Page