[arch-commits] Commit in cinnamon-session/repos (6 files)
Alexandre Filgueira
faidoc at archlinux.org
Mon Nov 7 22:15:00 UTC 2016
Date: Monday, November 7, 2016 @ 22:15:00
Author: faidoc
Revision: 195011
archrelease: copy trunk to community-i686, community-x86_64
Added:
cinnamon-session/repos/community-i686/PKGBUILD
(from rev 195010, cinnamon-session/trunk/PKGBUILD)
cinnamon-session/repos/community-x86_64/PKGBUILD
(from rev 195010, cinnamon-session/trunk/PKGBUILD)
Deleted:
cinnamon-session/repos/community-i686/PKGBUILD
cinnamon-session/repos/community-i686/qt-5.7.patch
cinnamon-session/repos/community-x86_64/PKGBUILD
cinnamon-session/repos/community-x86_64/qt-5.7.patch
-------------------------------+
/PKGBUILD | 80 +++++++++++
community-i686/PKGBUILD | 46 ------
community-i686/qt-5.7.patch | 267 ----------------------------------------
community-x86_64/PKGBUILD | 46 ------
community-x86_64/qt-5.7.patch | 267 ----------------------------------------
5 files changed, 80 insertions(+), 626 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-11-07 22:14:06 UTC (rev 195010)
+++ community-i686/PKGBUILD 2016-11-07 22:15:00 UTC (rev 195011)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=cinnamon-session
-pkgver=3.0.1
-pkgrel=2
-pkgdesc="The Cinnamon Session Handler"
-arch=(i686 x86_64)
-license=(GPL LGPL)
-depends=(dbus-glib cinnamon-desktop libsm libcanberra)
-makedepends=(intltool mesa json-glib xtrans gnome-common)
-options=('!emptydirs')
-url="https://github.com/linuxmint/cinnamon-session"
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz
- qt-5.7.patch)
-sha256sums=('d8935747bc8aa70518e70a7d338eaf9109b5307d8a44d49dc57e0f15d69e9c89'
- 'b85c460d680f5b807be89b12158141e43e8c5133c5e4c347a958ae2e187d6d11')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # Add support for applying GTK style to QT apps when running QT 5.7+
- # https://github.com/linuxmint/cinnamon-session/pull/75
- patch -Np1 -i ../qt-5.7.patch
-}
-
-build() {
- cd $pkgname-$pkgver
-
- CFLAGS="${CFLAGS} -Wno-error=format-nonliteral" ./autogen.sh \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/cinnamon-session \
- --disable-schemas-compile \
- --disable-gconf \
- --enable-qt57-theme-support
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: cinnamon-session/repos/community-i686/PKGBUILD (from rev 195010, cinnamon-session/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-11-07 22:15:00 UTC (rev 195011)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=cinnamon-session
+pkgver=3.2.0
+pkgrel=1
+pkgdesc="The Cinnamon Session Handler"
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(dbus-glib cinnamon-desktop libsm libcanberra)
+makedepends=(intltool mesa json-glib xtrans gnome-common)
+options=('!emptydirs')
+url="https://github.com/linuxmint/cinnamon-session"
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz)
+sha256sums=('d7c3d951ae0dddef96941c9f08f028a099443888db41981524f618a92624e0ca')
+
+prepare() {
+ cd $pkgname-$pkgver
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ CFLAGS="${CFLAGS} -Wno-error=format-nonliteral" ./autogen.sh \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib/cinnamon-session \
+ --disable-schemas-compile \
+ --disable-gconf \
+ --enable-qt57-theme-support
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: community-i686/qt-5.7.patch
===================================================================
--- community-i686/qt-5.7.patch 2016-11-07 22:14:06 UTC (rev 195010)
+++ community-i686/qt-5.7.patch 2016-11-07 22:15:00 UTC (rev 195011)
@@ -1,267 +0,0 @@
-From f954aa4c5a92b0215797732ecbd6995f68d856a4 Mon Sep 17 00:00:00 2001
-From: Dustin Falgout <dustin at falgout.us>
-Date: Sat, 9 Jul 2016 19:22:39 -0500
-Subject: [PATCH 1/6] update .gitignore
-
----
- .gitignore | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/.gitignore b/.gitignore
-index da44845..9c31281 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -38,3 +38,7 @@ Makefile.in
- *.old
- *.bak
-
-+## IDE files ##
-+.idea
-+CMakeLists.txt
-+
-
-From 4e58d04fd715b6a68195c4abeb4a8d31c08550ab Mon Sep 17 00:00:00 2001
-From: Dustin Falgout <dustin at falgout.us>
-Date: Sat, 9 Jul 2016 20:25:28 -0500
-Subject: [PATCH 2/6] Add support for applying GTK style to QT apps when
- running QT 5.7+ Maintain backwards compatibility for earlier versions of QT.
-
-Ref links:
-https://github.com/GNOME/gnome-session/commit/ce4208add3b49d440e0c418229774dd802ee6b87
-https://github.com/manjaro/release-plan/issues/73
----
- cinnamon-session/main.c | 25 +++++++++++++++++++++++--
- configure.ac | 12 ++++++++++++
- 2 files changed, 35 insertions(+), 2 deletions(-)
-
-diff --git a/cinnamon-session/main.c b/cinnamon-session/main.c
-index b2264ab..dda4d7b 100644
---- a/cinnamon-session/main.c
-+++ b/cinnamon-session/main.c
-@@ -296,6 +296,9 @@ main (int argc, char **argv)
- { "whale", 0, 0, G_OPTION_ARG_NONE, &please_fail, N_("Show the fail whale dialog for testing"), NULL },
- { NULL, 0, 0, 0, NULL, NULL, NULL }
- };
-+ gchar *qt_platform_theme_current = NULL;
-+ gchar *qt_style_override_current = NULL;
-+ char *qt_platform_theme_new = NULL;
-
- /* Make sure that we have a session bus */
- if (!require_dbus_session (argc, argv, &error)) {
-@@ -383,8 +386,26 @@ main (int argc, char **argv)
- */
- csm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated");
-
-- /* Make QT5 apps follow the GTK style */
-- csm_util_setenv ("QT_STYLE_OVERRIDE", "gtk");
-+
-+ /* Make QT5 apps follow the GTK style. Starting with QT 5.7, a different
-+ * env var has to be set than what worked in previous versions.
-+ */
-+ qt_platform_theme_current = g_getenv ("QT_QPA_PLATFORMTHEME");
-+ qt_style_override_current = g_getenv ("QT_STYLE_OVERRIDE");
-+ qt_platform_theme_new = HAVE_QT57 ? "qt5ct" : "qgnomeplatform";
-+
-+ if (NULL == qt_platform_theme_current) {
-+ csm_util_setenv ("QT_QPA_PLATFORMTHEME", qt_platform_theme_new);
-+ }
-+
-+ if (NULL == qt_style_override_current) {
-+ csm_util_setenv ("QT_STYLE_OVERRIDE", "gtk");
-+ }
-+
-+ g_free(qt_platform_theme_current);
-+ g_free(qt_style_override_current);
-+ g_free(qt_platform_theme_new);
-+
-
- /* GTK Overlay scrollbars */
- settings = g_settings_new ("org.cinnamon.desktop.interface");
-diff --git a/configure.ac b/configure.ac
-index fa1b795..2b4e417 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -108,6 +108,18 @@ AC_SUBST(LOGIND_CFLAGS)
- AC_SUBST(LOGIND_LIBS)
-
- dnl ====================================================================
-+dnl Check for qt 5.7+ to set correct env var for theme
-+dnl ====================================================================
-+PKG_CHECK_MODULES([QT57], [qt-5.0 >= 5.7],
-+ [AC_DEFINE([HAVE_QT57], [1], [Have Qt 5.7+])],
-+ [AC_DEFINE([HAVE_QT57], [0], [Have Qt 5.7+])]
-+)
-+AM_CONDITIONAL([HAVE_QT57], [test "$HAVE_QT57" -eq 1])
-+if test $HAVE_QT57=1; then
-+ AC_DEFINE(HAVE_QT57, 1, [Have QT 5.7+])
-+fi
-+
-+dnl ====================================================================
- dnl X development libraries check
- dnl ====================================================================
-
-
-From ea20debdd38f393b3098b03391d117a3af668456 Mon Sep 17 00:00:00 2001
-From: Dustin Falgout <dustin at falgout.us>
-Date: Sat, 9 Jul 2016 22:26:07 -0500
-Subject: [PATCH 3/6] use build time option instead of pkgcheck for obvious
- reasons :sweat_smile:
-
----
- configure.ac | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2b4e417..cad1bbb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -108,15 +108,15 @@ AC_SUBST(LOGIND_CFLAGS)
- AC_SUBST(LOGIND_LIBS)
-
- dnl ====================================================================
--dnl Check for qt 5.7+ to set correct env var for theme
-+dnl Check for qt 5.7+ to set correct env var for theme/styling
- dnl ====================================================================
--PKG_CHECK_MODULES([QT57], [qt-5.0 >= 5.7],
-- [AC_DEFINE([HAVE_QT57], [1], [Have Qt 5.7+])],
-- [AC_DEFINE([HAVE_QT57], [0], [Have Qt 5.7+])]
--)
--AM_CONDITIONAL([HAVE_QT57], [test "$HAVE_QT57" -eq 1])
--if test $HAVE_QT57=1; then
-- AC_DEFINE(HAVE_QT57, 1, [Have QT 5.7+])
-+AC_ARG_ENABLE(qt57_theme_support,
-+ AS_HELP_STRING([--enable-qt57-theme-support], [Support GTK styles for QT apps with QT 5.7+]),
-+ [enable_qt57_theme_support=yes],
-+ [enable_qt57_theme_support=no])
-+
-+if test x$enable_qt57_theme_support = xyes; then
-+ AC_DEFINE([HAVE_QT57], [1], [Have QT 5.7+])
- fi
-
- dnl ====================================================================
-@@ -361,12 +361,13 @@ echo "
-
- GConf support: ${enable_gconf}
- Logind support: ${have_logind}
-+ Qt 5.7+ theme support: ${enable_qt57_theme_support}
- IPv6 support: ${have_full_ipv6}
- Backtrace support: ${have_backtrace}
- XRender support: ${have_xrender}
- XSync support: ${have_xsync}
- XTest support: ${have_xtest}
-- Legacy UPower backend: ${have_old_upower}
-+ Legacy UPower backend: ${have_old_upower}
- Build documentation: ${enable_docbook_docs}
-
- "
-
-From 7d50736d0d4c035e940b17e8a98b6e2432091d09 Mon Sep 17 00:00:00 2001
-From: Dustin Falgout <dustin at falgout.us>
-Date: Sun, 10 Jul 2016 05:38:44 -0500
-Subject: [PATCH 4/6] remove unecessary call to g_free
-
----
- cinnamon-session/main.c | 1 -
- configure.ac | 2 ++
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/cinnamon-session/main.c b/cinnamon-session/main.c
-index dda4d7b..f3ce2c5 100644
---- a/cinnamon-session/main.c
-+++ b/cinnamon-session/main.c
-@@ -404,7 +404,6 @@ main (int argc, char **argv)
-
- g_free(qt_platform_theme_current);
- g_free(qt_style_override_current);
-- g_free(qt_platform_theme_new);
-
-
- /* GTK Overlay scrollbars */
-diff --git a/configure.ac b/configure.ac
-index cad1bbb..464c847 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -117,6 +117,8 @@ AC_ARG_ENABLE(qt57_theme_support,
-
- if test x$enable_qt57_theme_support = xyes; then
- AC_DEFINE([HAVE_QT57], [1], [Have QT 5.7+])
-+else
-+ AC_DEFINE([HAVE_QT57], [0], [Have QT 5.7+])
- fi
-
- dnl ====================================================================
-
-From 4258be7220551321a939dd77f51f1d016aa83955 Mon Sep 17 00:00:00 2001
-From: Dustin Falgout <dustin at falgout.us>
-Date: Mon, 18 Jul 2016 04:28:57 -0500
-Subject: [PATCH 5/6] Incorporated feedback
-
----
- cinnamon-session/main.c | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/cinnamon-session/main.c b/cinnamon-session/main.c
-index f3ce2c5..c137432 100644
---- a/cinnamon-session/main.c
-+++ b/cinnamon-session/main.c
-@@ -296,8 +296,6 @@ main (int argc, char **argv)
- { "whale", 0, 0, G_OPTION_ARG_NONE, &please_fail, N_("Show the fail whale dialog for testing"), NULL },
- { NULL, 0, 0, 0, NULL, NULL, NULL }
- };
-- gchar *qt_platform_theme_current = NULL;
-- gchar *qt_style_override_current = NULL;
- char *qt_platform_theme_new = NULL;
-
- /* Make sure that we have a session bus */
-@@ -390,21 +388,16 @@ main (int argc, char **argv)
- /* Make QT5 apps follow the GTK style. Starting with QT 5.7, a different
- * env var has to be set than what worked in previous versions.
- */
-- qt_platform_theme_current = g_getenv ("QT_QPA_PLATFORMTHEME");
-- qt_style_override_current = g_getenv ("QT_STYLE_OVERRIDE");
- qt_platform_theme_new = HAVE_QT57 ? "qt5ct" : "qgnomeplatform";
-
-- if (NULL == qt_platform_theme_current) {
-+ if (NULL == g_getenv ("QT_QPA_PLATFORMTHEME")) {
- csm_util_setenv ("QT_QPA_PLATFORMTHEME", qt_platform_theme_new);
- }
-
-- if (NULL == qt_style_override_current) {
-+ if (NULL == g_getenv ("QT_STYLE_OVERRIDE")) {
- csm_util_setenv ("QT_STYLE_OVERRIDE", "gtk");
- }
-
-- g_free(qt_platform_theme_current);
-- g_free(qt_style_override_current);
--
-
- /* GTK Overlay scrollbars */
- settings = g_settings_new ("org.cinnamon.desktop.interface");
-
-From 7c34ec9028c5f7b01e5393aeff78cc7e9a0cc8b5 Mon Sep 17 00:00:00 2001
-From: Dustin Falgout <dustin at falgout.us>
-Date: Mon, 5 Sep 2016 01:17:02 -0500
-Subject: [PATCH 6/6] implement change described in PR comments related to
- "QT_STYLE_OVERRIDE" env var and qt versions 5.7+
-
----
- cinnamon-session/main.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/cinnamon-session/main.c b/cinnamon-session/main.c
-index c137432..f36a8a4 100644
---- a/cinnamon-session/main.c
-+++ b/cinnamon-session/main.c
-@@ -394,8 +394,11 @@ main (int argc, char **argv)
- csm_util_setenv ("QT_QPA_PLATFORMTHEME", qt_platform_theme_new);
- }
-
-- if (NULL == g_getenv ("QT_STYLE_OVERRIDE")) {
-+ if ( ! HAVE_QT57 && NULL == g_getenv ("QT_STYLE_OVERRIDE") ) {
- csm_util_setenv ("QT_STYLE_OVERRIDE", "gtk");
-+
-+ } else if (HAVE_QT57 && NULL != g_getenv ("QT_STYLE_OVERRIDE")) {
-+ g_unsetenv ("QT_STYLE_OVERRIDE");
- }
-
-
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-11-07 22:14:06 UTC (rev 195010)
+++ community-x86_64/PKGBUILD 2016-11-07 22:15:00 UTC (rev 195011)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=cinnamon-session
-pkgver=3.0.1
-pkgrel=2
-pkgdesc="The Cinnamon Session Handler"
-arch=(i686 x86_64)
-license=(GPL LGPL)
-depends=(dbus-glib cinnamon-desktop libsm libcanberra)
-makedepends=(intltool mesa json-glib xtrans gnome-common)
-options=('!emptydirs')
-url="https://github.com/linuxmint/cinnamon-session"
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz
- qt-5.7.patch)
-sha256sums=('d8935747bc8aa70518e70a7d338eaf9109b5307d8a44d49dc57e0f15d69e9c89'
- 'b85c460d680f5b807be89b12158141e43e8c5133c5e4c347a958ae2e187d6d11')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # Add support for applying GTK style to QT apps when running QT 5.7+
- # https://github.com/linuxmint/cinnamon-session/pull/75
- patch -Np1 -i ../qt-5.7.patch
-}
-
-build() {
- cd $pkgname-$pkgver
-
- CFLAGS="${CFLAGS} -Wno-error=format-nonliteral" ./autogen.sh \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/cinnamon-session \
- --disable-schemas-compile \
- --disable-gconf \
- --enable-qt57-theme-support
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: cinnamon-session/repos/community-x86_64/PKGBUILD (from rev 195010, cinnamon-session/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-11-07 22:15:00 UTC (rev 195011)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=cinnamon-session
+pkgver=3.2.0
+pkgrel=1
+pkgdesc="The Cinnamon Session Handler"
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(dbus-glib cinnamon-desktop libsm libcanberra)
+makedepends=(intltool mesa json-glib xtrans gnome-common)
+options=('!emptydirs')
+url="https://github.com/linuxmint/cinnamon-session"
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz)
+sha256sums=('d7c3d951ae0dddef96941c9f08f028a099443888db41981524f618a92624e0ca')
+
+prepare() {
+ cd $pkgname-$pkgver
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ CFLAGS="${CFLAGS} -Wno-error=format-nonliteral" ./autogen.sh \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib/cinnamon-session \
+ --disable-schemas-compile \
+ --disable-gconf \
+ --enable-qt57-theme-support
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: community-x86_64/qt-5.7.patch
===================================================================
--- community-x86_64/qt-5.7.patch 2016-11-07 22:14:06 UTC (rev 195010)
+++ community-x86_64/qt-5.7.patch 2016-11-07 22:15:00 UTC (rev 195011)
@@ -1,267 +0,0 @@
-From f954aa4c5a92b0215797732ecbd6995f68d856a4 Mon Sep 17 00:00:00 2001
-From: Dustin Falgout <dustin at falgout.us>
-Date: Sat, 9 Jul 2016 19:22:39 -0500
-Subject: [PATCH 1/6] update .gitignore
-
----
- .gitignore | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/.gitignore b/.gitignore
-index da44845..9c31281 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -38,3 +38,7 @@ Makefile.in
- *.old
- *.bak
-
-+## IDE files ##
-+.idea
-+CMakeLists.txt
-+
-
-From 4e58d04fd715b6a68195c4abeb4a8d31c08550ab Mon Sep 17 00:00:00 2001
-From: Dustin Falgout <dustin at falgout.us>
-Date: Sat, 9 Jul 2016 20:25:28 -0500
-Subject: [PATCH 2/6] Add support for applying GTK style to QT apps when
- running QT 5.7+ Maintain backwards compatibility for earlier versions of QT.
-
-Ref links:
-https://github.com/GNOME/gnome-session/commit/ce4208add3b49d440e0c418229774dd802ee6b87
-https://github.com/manjaro/release-plan/issues/73
----
- cinnamon-session/main.c | 25 +++++++++++++++++++++++--
- configure.ac | 12 ++++++++++++
- 2 files changed, 35 insertions(+), 2 deletions(-)
-
-diff --git a/cinnamon-session/main.c b/cinnamon-session/main.c
-index b2264ab..dda4d7b 100644
---- a/cinnamon-session/main.c
-+++ b/cinnamon-session/main.c
-@@ -296,6 +296,9 @@ main (int argc, char **argv)
- { "whale", 0, 0, G_OPTION_ARG_NONE, &please_fail, N_("Show the fail whale dialog for testing"), NULL },
- { NULL, 0, 0, 0, NULL, NULL, NULL }
- };
-+ gchar *qt_platform_theme_current = NULL;
-+ gchar *qt_style_override_current = NULL;
-+ char *qt_platform_theme_new = NULL;
-
- /* Make sure that we have a session bus */
- if (!require_dbus_session (argc, argv, &error)) {
-@@ -383,8 +386,26 @@ main (int argc, char **argv)
- */
- csm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated");
-
-- /* Make QT5 apps follow the GTK style */
-- csm_util_setenv ("QT_STYLE_OVERRIDE", "gtk");
-+
-+ /* Make QT5 apps follow the GTK style. Starting with QT 5.7, a different
-+ * env var has to be set than what worked in previous versions.
-+ */
-+ qt_platform_theme_current = g_getenv ("QT_QPA_PLATFORMTHEME");
-+ qt_style_override_current = g_getenv ("QT_STYLE_OVERRIDE");
-+ qt_platform_theme_new = HAVE_QT57 ? "qt5ct" : "qgnomeplatform";
-+
-+ if (NULL == qt_platform_theme_current) {
-+ csm_util_setenv ("QT_QPA_PLATFORMTHEME", qt_platform_theme_new);
-+ }
-+
-+ if (NULL == qt_style_override_current) {
-+ csm_util_setenv ("QT_STYLE_OVERRIDE", "gtk");
-+ }
-+
-+ g_free(qt_platform_theme_current);
-+ g_free(qt_style_override_current);
-+ g_free(qt_platform_theme_new);
-+
-
- /* GTK Overlay scrollbars */
- settings = g_settings_new ("org.cinnamon.desktop.interface");
-diff --git a/configure.ac b/configure.ac
-index fa1b795..2b4e417 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -108,6 +108,18 @@ AC_SUBST(LOGIND_CFLAGS)
- AC_SUBST(LOGIND_LIBS)
-
- dnl ====================================================================
-+dnl Check for qt 5.7+ to set correct env var for theme
-+dnl ====================================================================
-+PKG_CHECK_MODULES([QT57], [qt-5.0 >= 5.7],
-+ [AC_DEFINE([HAVE_QT57], [1], [Have Qt 5.7+])],
-+ [AC_DEFINE([HAVE_QT57], [0], [Have Qt 5.7+])]
-+)
-+AM_CONDITIONAL([HAVE_QT57], [test "$HAVE_QT57" -eq 1])
-+if test $HAVE_QT57=1; then
-+ AC_DEFINE(HAVE_QT57, 1, [Have QT 5.7+])
-+fi
-+
-+dnl ====================================================================
- dnl X development libraries check
- dnl ====================================================================
-
-
-From ea20debdd38f393b3098b03391d117a3af668456 Mon Sep 17 00:00:00 2001
-From: Dustin Falgout <dustin at falgout.us>
-Date: Sat, 9 Jul 2016 22:26:07 -0500
-Subject: [PATCH 3/6] use build time option instead of pkgcheck for obvious
- reasons :sweat_smile:
-
----
- configure.ac | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2b4e417..cad1bbb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -108,15 +108,15 @@ AC_SUBST(LOGIND_CFLAGS)
- AC_SUBST(LOGIND_LIBS)
-
- dnl ====================================================================
--dnl Check for qt 5.7+ to set correct env var for theme
-+dnl Check for qt 5.7+ to set correct env var for theme/styling
- dnl ====================================================================
--PKG_CHECK_MODULES([QT57], [qt-5.0 >= 5.7],
-- [AC_DEFINE([HAVE_QT57], [1], [Have Qt 5.7+])],
-- [AC_DEFINE([HAVE_QT57], [0], [Have Qt 5.7+])]
--)
--AM_CONDITIONAL([HAVE_QT57], [test "$HAVE_QT57" -eq 1])
--if test $HAVE_QT57=1; then
-- AC_DEFINE(HAVE_QT57, 1, [Have QT 5.7+])
-+AC_ARG_ENABLE(qt57_theme_support,
-+ AS_HELP_STRING([--enable-qt57-theme-support], [Support GTK styles for QT apps with QT 5.7+]),
-+ [enable_qt57_theme_support=yes],
-+ [enable_qt57_theme_support=no])
-+
-+if test x$enable_qt57_theme_support = xyes; then
-+ AC_DEFINE([HAVE_QT57], [1], [Have QT 5.7+])
- fi
-
- dnl ====================================================================
-@@ -361,12 +361,13 @@ echo "
-
- GConf support: ${enable_gconf}
- Logind support: ${have_logind}
-+ Qt 5.7+ theme support: ${enable_qt57_theme_support}
- IPv6 support: ${have_full_ipv6}
- Backtrace support: ${have_backtrace}
- XRender support: ${have_xrender}
- XSync support: ${have_xsync}
- XTest support: ${have_xtest}
-- Legacy UPower backend: ${have_old_upower}
-+ Legacy UPower backend: ${have_old_upower}
- Build documentation: ${enable_docbook_docs}
-
- "
-
-From 7d50736d0d4c035e940b17e8a98b6e2432091d09 Mon Sep 17 00:00:00 2001
-From: Dustin Falgout <dustin at falgout.us>
-Date: Sun, 10 Jul 2016 05:38:44 -0500
-Subject: [PATCH 4/6] remove unecessary call to g_free
-
----
- cinnamon-session/main.c | 1 -
- configure.ac | 2 ++
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/cinnamon-session/main.c b/cinnamon-session/main.c
-index dda4d7b..f3ce2c5 100644
---- a/cinnamon-session/main.c
-+++ b/cinnamon-session/main.c
-@@ -404,7 +404,6 @@ main (int argc, char **argv)
-
- g_free(qt_platform_theme_current);
- g_free(qt_style_override_current);
-- g_free(qt_platform_theme_new);
-
-
- /* GTK Overlay scrollbars */
-diff --git a/configure.ac b/configure.ac
-index cad1bbb..464c847 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -117,6 +117,8 @@ AC_ARG_ENABLE(qt57_theme_support,
-
- if test x$enable_qt57_theme_support = xyes; then
- AC_DEFINE([HAVE_QT57], [1], [Have QT 5.7+])
-+else
-+ AC_DEFINE([HAVE_QT57], [0], [Have QT 5.7+])
- fi
-
- dnl ====================================================================
-
-From 4258be7220551321a939dd77f51f1d016aa83955 Mon Sep 17 00:00:00 2001
-From: Dustin Falgout <dustin at falgout.us>
-Date: Mon, 18 Jul 2016 04:28:57 -0500
-Subject: [PATCH 5/6] Incorporated feedback
-
----
- cinnamon-session/main.c | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/cinnamon-session/main.c b/cinnamon-session/main.c
-index f3ce2c5..c137432 100644
---- a/cinnamon-session/main.c
-+++ b/cinnamon-session/main.c
-@@ -296,8 +296,6 @@ main (int argc, char **argv)
- { "whale", 0, 0, G_OPTION_ARG_NONE, &please_fail, N_("Show the fail whale dialog for testing"), NULL },
- { NULL, 0, 0, 0, NULL, NULL, NULL }
- };
-- gchar *qt_platform_theme_current = NULL;
-- gchar *qt_style_override_current = NULL;
- char *qt_platform_theme_new = NULL;
-
- /* Make sure that we have a session bus */
-@@ -390,21 +388,16 @@ main (int argc, char **argv)
- /* Make QT5 apps follow the GTK style. Starting with QT 5.7, a different
- * env var has to be set than what worked in previous versions.
- */
-- qt_platform_theme_current = g_getenv ("QT_QPA_PLATFORMTHEME");
-- qt_style_override_current = g_getenv ("QT_STYLE_OVERRIDE");
- qt_platform_theme_new = HAVE_QT57 ? "qt5ct" : "qgnomeplatform";
-
-- if (NULL == qt_platform_theme_current) {
-+ if (NULL == g_getenv ("QT_QPA_PLATFORMTHEME")) {
- csm_util_setenv ("QT_QPA_PLATFORMTHEME", qt_platform_theme_new);
- }
-
-- if (NULL == qt_style_override_current) {
-+ if (NULL == g_getenv ("QT_STYLE_OVERRIDE")) {
- csm_util_setenv ("QT_STYLE_OVERRIDE", "gtk");
- }
-
-- g_free(qt_platform_theme_current);
-- g_free(qt_style_override_current);
--
-
- /* GTK Overlay scrollbars */
- settings = g_settings_new ("org.cinnamon.desktop.interface");
-
-From 7c34ec9028c5f7b01e5393aeff78cc7e9a0cc8b5 Mon Sep 17 00:00:00 2001
-From: Dustin Falgout <dustin at falgout.us>
-Date: Mon, 5 Sep 2016 01:17:02 -0500
-Subject: [PATCH 6/6] implement change described in PR comments related to
- "QT_STYLE_OVERRIDE" env var and qt versions 5.7+
-
----
- cinnamon-session/main.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/cinnamon-session/main.c b/cinnamon-session/main.c
-index c137432..f36a8a4 100644
---- a/cinnamon-session/main.c
-+++ b/cinnamon-session/main.c
-@@ -394,8 +394,11 @@ main (int argc, char **argv)
- csm_util_setenv ("QT_QPA_PLATFORMTHEME", qt_platform_theme_new);
- }
-
-- if (NULL == g_getenv ("QT_STYLE_OVERRIDE")) {
-+ if ( ! HAVE_QT57 && NULL == g_getenv ("QT_STYLE_OVERRIDE") ) {
- csm_util_setenv ("QT_STYLE_OVERRIDE", "gtk");
-+
-+ } else if (HAVE_QT57 && NULL != g_getenv ("QT_STYLE_OVERRIDE")) {
-+ g_unsetenv ("QT_STYLE_OVERRIDE");
- }
-
-
More information about the arch-commits
mailing list