Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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 (60fc8a9ea28413a1bf6050f4f19e19d35a362618)
  • Date: Mon, 2 May 2016 12:16:00 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde5-pim/kpimtextedit/0001-KF5DesignerPlugin-optional.patch | 41
++++++++++++
kde5-pim/kpimtextedit/DEPENDS | 8 +-
kde5-pim/kpimtextedit/HISTORY | 4 +
kde5-pim/kpimtextedit/PRE_BUILD | 3
qt5-cmake/otter/DEPENDS | 10 +-
qt5-cmake/otter/DETAILS | 4 -
qt5-cmake/otter/HISTORY | 5 +
security-libs/linux-pam/DEPENDS | 1
security-libs/linux-pam/HISTORY | 3
x11/lightdm/DETAILS | 4 -
x11/lightdm/HISTORY | 3
11 files changed, 75 insertions(+), 11 deletions(-)

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

otter: => 0.9.10

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

linux-pam - optional depends audit

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

lightdm: => 1.18.1

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

kpimtextedit - make kdesignerplugin optional

diff --git a/kde5-pim/kpimtextedit/0001-KF5DesignerPlugin-optional.patch
b/kde5-pim/kpimtextedit/0001-KF5DesignerPlugin-optional.patch
new file mode 100644
index 0000000..dd6e916
--- /dev/null
+++ b/kde5-pim/kpimtextedit/0001-KF5DesignerPlugin-optional.patch
@@ -0,0 +1,41 @@
+From a433e8b127ac131893282a4bc4369f20f8d661f5 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Fri, 29 Apr 2016 11:10:08 +0200
+Subject: [PATCH] KF5DesignerPlugin optional
+
+---
+ CMakeLists.txt | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 62b43aa..fceb34b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,11 +29,6 @@ ecm_setup_version(${KPIMTEXTEDIT_LIB_VERSION}
VARIABLE_PREFIX KPIMTEXTEDIT
+ set(QT_REQUIRED_VERSION "5.4.0")
+ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Test
Widgets DBus)
+ find_package(Grantlee5 "5.0" CONFIG REQUIRED)
+-find_package(Qt5Designer NO_MODULE)
+-set_package_properties(Qt5Designer PROPERTIES
+- PURPOSE "Required to build the Qt Designer plugins"
+- TYPE OPTIONAL
+-)
+
+
+ ########### Find packages ###########
+@@ -48,7 +43,11 @@ find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5ConfigWidgets ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
+-find_package(KF5DesignerPlugin ${KF5_VERSION} CONFIG REQUIRED)
++
++find_package(KF5DesignerPlugin ${KF5_VERSION} CONFIG)
++if(KF5DesignerPlugin_FOUND)
++ find_package(Qt5Designer CONFIG REQUIRED)
++endif()
+
+ add_definitions(-DTRANSLATION_DOMAIN=\"libkpimtextedit\")
+ add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
+--
+2.8.0
+
diff --git a/kde5-pim/kpimtextedit/DEPENDS b/kde5-pim/kpimtextedit/DEPENDS
index 830ae15..47e29fd 100755
--- a/kde5-pim/kpimtextedit/DEPENDS
+++ b/kde5-pim/kpimtextedit/DEPENDS
@@ -1,9 +1,11 @@
source $GRIMOIRE/KDE5_DEPENDS &&
depends kcodecs &&
-depends kdesignerplugin &&
depends kemoticons &&
depends kio &&
depends ktextwidgets &&
depends kwidgetsaddons &&
-depends sonnet
-
+depends sonnet &&
+optional_depends kdesignerplugin '' '' 'bulid designer plugins'
+if is_depends_enabled $SPELL kdesignerplugin;then
+ depends qttools
+fi
diff --git a/kde5-pim/kpimtextedit/HISTORY b/kde5-pim/kpimtextedit/HISTORY
index 0c7f8d9..5729329 100644
--- a/kde5-pim/kpimtextedit/HISTORY
+++ b/kde5-pim/kpimtextedit/HISTORY
@@ -1,3 +1,7 @@
+2016-04-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * 0001-KF5DesignerPlugin-optional.patch PRE_BUILD: added
+ * DEPENDS: kdesignerplugin optional
+
2016-04-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: update website

diff --git a/kde5-pim/kpimtextedit/PRE_BUILD b/kde5-pim/kpimtextedit/PRE_BUILD
new file mode 100755
index 0000000..1c86fc8
--- /dev/null
+++ b/kde5-pim/kpimtextedit/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/0001-KF5DesignerPlugin-optional.patch
diff --git a/qt5-cmake/otter/DEPENDS b/qt5-cmake/otter/DEPENDS
index c37da7c..31fdda9 100755
--- a/qt5-cmake/otter/DEPENDS
+++ b/qt5-cmake/otter/DEPENDS
@@ -1,6 +1,8 @@
source $GRIMOIRE/QT5_DEPENDS &&
depends qtmultimedia &&
-depends qtscript &&
-depends qtwebkit &&
-#depends libgcrypt
-optional_depends qtwebengine '-DEnableQtwebengine=1' '-DEnableQtwebengine=0'
'experimental web engine'
+depends qtxmlpatterns &&
+optional_depends libgcrypt '' '' 'crypto support' &&
+optional_depends qtwebengine '' ' -DENABLE_QTWEBENGINE=0' 'web engine
support' &&
+optional_depends qtwebkit '' ' -DENABLE_QTWEBKIT=0' 'web kit support'
&&
+optional_depends qtx11extras '' '' 'X11 support &&'
+optional_depends hunspell '' ' -DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=1'
'spell checker'
diff --git a/qt5-cmake/otter/DETAILS b/qt5-cmake/otter/DETAILS
index dc7f96a..7c52d70 100755
--- a/qt5-cmake/otter/DETAILS
+++ b/qt5-cmake/otter/DETAILS
@@ -1,7 +1,7 @@
SPELL=otter
SPELLX=otter-browser
- VERSION=0.9.09
-
SOURCE_HASH=sha512:99dfa46956fad59b3b170be24f3f2a725cb957e558019752856be23101399128cd6fda15c2dc5b65495078373821ba87c85d0cf570def466e20e2b197c0a0747
+ VERSION=0.9.10
+
SOURCE_HASH=sha512:81b747ffc9a6c78c618730a5ec0d0141cb1b35f750b24f9c3c579b6f37ddac12cf3b0dd08fc01c01f4ba2caf66afc086b72af5adc97711b25eafbc2d945ff5f0
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_URL=http://sourceforge.net/projects/$SPELLX/files/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5-cmake/otter/HISTORY b/qt5-cmake/otter/HISTORY
index 24362cb..7097491 100644
--- a/qt5-cmake/otter/HISTORY
+++ b/qt5-cmake/otter/HISTORY
@@ -1,3 +1,8 @@
+2016-05-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.10
+ * DEPENDS: add libgcrypt
+ improve qtweb{engine,kit} support
+
2016-01-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.09
* CONFIGURE: chmod
diff --git a/security-libs/linux-pam/DEPENDS b/security-libs/linux-pam/DEPENDS
index a74ad64..025c925 100755
--- a/security-libs/linux-pam/DEPENDS
+++ b/security-libs/linux-pam/DEPENDS
@@ -9,6 +9,7 @@ if [ "${PAM_DOCS}" == "y" ]; then
depends linuxdoc-tools
fi &&

+optional_depends audit '--enable-audit' '--disable-audit' 'Audit
support support' &&
optional_depends db '--enable-db=db' '--enable-db=no' 'database
backend' &&
optional_depends gettext '--enable-nls' '--disable-nls' 'NLS support'
&&
optional_depends libselinux "--enable-selinux" "--disable-selinux" "for
selinux support" &&
diff --git a/security-libs/linux-pam/HISTORY b/security-libs/linux-pam/HISTORY
index 820ca11..c4b30f0 100644
--- a/security-libs/linux-pam/HISTORY
+++ b/security-libs/linux-pam/HISTORY
@@ -1,3 +1,6 @@
+2016-05-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add audit
+
2015-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.2.1
* BUILD: build static and shared library
diff --git a/x11/lightdm/DETAILS b/x11/lightdm/DETAILS
index 0bb7722..3f2a34f 100755
--- a/x11/lightdm/DETAILS
+++ b/x11/lightdm/DETAILS
@@ -1,6 +1,6 @@
SPELL=lightdm
- VERSION=1.17.2
-
SOURCE_HASH=sha512:07fffab17a917e6d03eac1850c205342e8fe7f627abf3820ebfe3107ef827af4fc4443bcaa7ec447760dcf0de9c2b517472854f7562bb3dc915a23c9742ccb15
+ VERSION=1.18.1
+
SOURCE_HASH=sha512:6b7c4900a91d033fdd679d2e14f4ed38016d91b57c0b2d288d7d655943352caa8b6484aae2d4e99445de7829fbebc0c869a5c2f7023e0198c9b66943bb601375
VX=`echo $VERSION|cut -d. -f-2`
SOURCE="${SPELL}-${VERSION}.tar.xz"

SOURCE_URL[0]=https://launchpad.net/${SPELL}/$VX/$VERSION/+download/${SOURCE}
diff --git a/x11/lightdm/HISTORY b/x11/lightdm/HISTORY
index 705e51e..3006918 100644
--- a/x11/lightdm/HISTORY
+++ b/x11/lightdm/HISTORY
@@ -1,3 +1,6 @@
+2016-05-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.18.1
+
2015-11-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.17.2




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (60fc8a9ea28413a1bf6050f4f19e19d35a362618), Treeve Jelbert, 05/02/2016

Archive powered by MHonArc 2.6.24.

Top of Page