[Xfce4-commits] [xfce/xfdesktop] 01/01: Updates for release.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

e   r   i   c       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       x   f   c   e   -   4   .   1   2   
   in repository xfce/xfdesktop.

commit 710608afbd8bb3953cbe73b937e9fc27b227f4b1
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Mon Jun 26 16:54:32 2017 +0300

    Updates for release.
---
 NEWS                 | 10 ++++++++++
 configure.ac.in      |  4 ++--
 settings/Makefile.am |  2 ++
 src/Makefile.am      |  2 ++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 8930e79..29b0388 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+4.12.4
+======
+Stable release of xfdesktop for Xfce 4.12.
+
+* Bug fixes:
+ - Work around a regression in Gtk2 allowing directories to be selected
+   in the settings dialog Bug #12832
+ - Don't try to divide by 0 Bug #12115
+ - Add DBUS_CFLAGS and DBUS_LIBS so that it compiles with newer xfconf.
+
 4.12.3
 ======
 Stable release of xfdesktop for Xfce 4.12.
diff --git a/configure.ac.in b/configure.ac.in
index d1e0f84..fa41bb6 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -6,10 +6,10 @@ dnl
 dnl version info
 m4_define([xfdesktop_version_major], [4])
 m4_define([xfdesktop_version_minor], [12])
-m4_define([xfdesktop_version_micro], [3])
+m4_define([xfdesktop_version_micro], [4])
 m4_define([xfdesktop_version_nano], [])
 m4_define([xfdesktop_version_build], [@REVISION@])
-m4_define([xfdesktop_version_tag],[git])
+m4_define([xfdesktop_version_tag],[])
 m4_define([xfdesktop_version], [xfdesktop_version_major().xfdesktop_version_minor().xfdesktop_version_micro()ifelse(xfdesktop_version_nano(), [], [], [.xfdesktop_version_nano()])ifelse(xfdesktop_version_tag(), [git], [xfdesktop_version_tag()-xfdesktop_version_build()], [xfdesktop_version_tag()])])
 
 dnl minimum required versions
diff --git a/settings/Makefile.am b/settings/Makefile.am
index b8f68cf..c584df5 100644
--- a/settings/Makefile.am
+++ b/settings/Makefile.am
@@ -15,6 +15,7 @@ xfdesktop_settings_CFLAGS =						\
 	$(GTHREAD_CFLAGS)							\
 	$(LIBX11_CFLAGS)							\
 	$(LIBWNCK_CFLAGS) 							\
+	$(DBUS_CFLAGS)								\
 	-DG_LOG_DOMAIN=\"xfdesktop-settings\"		\
 	-DEXO_API_SUBJECT_TO_CHANGE					\
 	-DWNCK_I_KNOW_THIS_IS_UNSTABLE 				\
@@ -30,6 +31,7 @@ xfdesktop_settings_LDADD =						\
 	$(GTHREAD_LIBS)								\
 	$(LIBWNCK_LIBS) 							\
 	$(LIBX11_LIBS)								\
+	$(DBUS_LIBS)								\
 	$(GTK_LIBS)
 
 if HAVE_CYGWIN
diff --git a/src/Makefile.am b/src/Makefile.am
index ea336eb..e71410f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -86,6 +86,7 @@ xfdesktop_CFLAGS = \
 	$(LIBXFCE4UI_CFLAGS) \
 	$(LIBXFCE4SMCLIENT_PRIVATE_CFLAGS) \
 	$(LIBWNCK_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(XFCONF_CFLAGS) \
 	-DEXO_API_SUBJECT_TO_CHANGE \
 	$(LIBEXO_CFLAGS)
@@ -109,6 +110,7 @@ xfdesktop_LDADD += \
 	$(LIBXFCE4SMCLIENT_PRIVATE_LIBS) \
 	$(LIBWNCK_LIBS) \
 	$(XFCONF_LIBS) \
+	$(DBUS_LIBS) \
 	$(LIBEXO_LIBS) \
 	-lm
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.