This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via c53fc32dcd1084f17cfbe30822799a0adc3a87d5 (commit)
via 00a7d07e8c8a62510a8bc7b016eab2d204f2a6c0 (commit)
via 04894e94c8b2055e2f43c2d41acf5863bbd544d6 (commit)
via f59b263993983a4e89dc7e51e7fa37c858304937 (commit)
via 45a976b5d47e7968dfee8768c1bf4373015b8593 (commit)
via 9fb260d046f96575bb11423549b85b8d284c30e7 (commit)
from e74afba8d7e7e8f003735208be30328bd5d2ce25 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/c53fc32dcd1084f17cfbe30822799a0adc3a87d5
commit c53fc32dcd1084f17cfbe30822799a0adc3a87d5
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Sun Nov 3 14:38:03 2013 +0100
WPrefs: Marked args as unused for compiler in callback code
The function is a callback, which means having a fixed argument list.
It is then correct to not use all the arguments, so this patch adds the
appropriate stuff to avoid a false report from compiler.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/WPrefs.app/Menu.c b/WPrefs.app/Menu.c
index 2b7f4fb..59d407e 100644
--- a/WPrefs.app/Menu.c
+++ b/WPrefs.app/Menu.c
@@ -1274,6 +1274,9 @@ static void menuItemEdited(struct WEditMenuDelegate
*delegate, WEditMenu * menu,
_Panel *panel = (_Panel *) delegate->data;
WEditMenu *submenu;
+ /* Parameter not used, but tell the compiler it is ok */
+ (void) menu;
+
updateFrameTitle(panel, WGetEditMenuItemTitle(item),
panel->currentType);
submenu = WGetEditMenuSubmenu(item);
http://repo.or.cz/w/wmaker-crm.git/commit/00a7d07e8c8a62510a8bc7b016eab2d204f2a6c0
commit 00a7d07e8c8a62510a8bc7b016eab2d204f2a6c0
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Sun Nov 3 14:38:02 2013 +0100
WPrefs: Removed unused argument in function 'WGetEditMenuSubmenu'
The function did not use the argument 'mPtr', so removed it.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/WPrefs.app/Menu.c b/WPrefs.app/Menu.c
index 7d1961c..2b7f4fb 100644
--- a/WPrefs.app/Menu.c
+++ b/WPrefs.app/Menu.c
@@ -1276,7 +1276,7 @@ static void menuItemEdited(struct WEditMenuDelegate
*delegate, WEditMenu * menu,
updateFrameTitle(panel, WGetEditMenuItemTitle(item),
panel->currentType);
- submenu = WGetEditMenuSubmenu(menu, item);
+ submenu = WGetEditMenuSubmenu(item);
if (submenu) {
WSetEditMenuTitle(submenu, WGetEditMenuItemTitle(item));
}
@@ -1289,7 +1289,7 @@ static Bool shouldRemoveItem(struct WEditMenuDelegate
*delegate, WEditMenu * men
if (panel->dontAsk)
return True;
- if (WGetEditMenuSubmenu(menu, item)) {
+ if (WGetEditMenuSubmenu(item)) {
int res;
res = WMRunAlertPanel(WMWidgetScreen(menu), NULL,
@@ -1683,7 +1683,7 @@ static WMPropList *processSubmenu(WEditMenu * menu)
s = WGetEditMenuItemTitle(item);
- submenu = WGetEditMenuSubmenu(menu, item);
+ submenu = WGetEditMenuSubmenu(item);
if (submenu) {
pl = processSubmenu(submenu);
} else {
diff --git a/WPrefs.app/editmenu.c b/WPrefs.app/editmenu.c
index 69cb38f..c3cf296 100644
--- a/WPrefs.app/editmenu.c
+++ b/WPrefs.app/editmenu.c
@@ -507,7 +507,7 @@ void WSetEditMenuSubmenu(WEditMenu * mPtr, WEditMenuItem *
item, WEditMenu * sub
paintEditMenuItem(item);
}
-WEditMenu *WGetEditMenuSubmenu(WEditMenu * mPtr, WEditMenuItem * item)
+WEditMenu *WGetEditMenuSubmenu(WEditMenuItem *item)
{
return item->submenu;
}
@@ -622,7 +622,7 @@ void WEditMenuHide(WEditMenu * mPtr)
while ((item = WGetEditMenuItem(mPtr, i++))) {
WEditMenu *submenu;
- submenu = WGetEditMenuSubmenu(mPtr, item);
+ submenu = WGetEditMenuSubmenu(item);
if (submenu) {
WEditMenuHide(submenu);
}
@@ -640,7 +640,7 @@ void WEditMenuUnhide(WEditMenu * mPtr)
while ((item = WGetEditMenuItem(mPtr, i++))) {
WEditMenu *submenu;
- submenu = WGetEditMenuSubmenu(mPtr, item);
+ submenu = WGetEditMenuSubmenu(item);
if (submenu) {
WEditMenuUnhide(submenu);
}
diff --git a/WPrefs.app/editmenu.h b/WPrefs.app/editmenu.h
index 3fde0b5..1195fe0 100644
--- a/WPrefs.app/editmenu.h
+++ b/WPrefs.app/editmenu.h
@@ -81,7 +81,7 @@ void WSetEditMenuSubmenu(WEditMenu *mPtr, WEditMenuItem *item,
WEditMenu *submenu);
-WEditMenu *WGetEditMenuSubmenu(WEditMenu *mPtr, WEditMenuItem *item);
+WEditMenu *WGetEditMenuSubmenu(WEditMenuItem *item);
void WRemoveEditMenuItem(WEditMenu *mPtr, WEditMenuItem *item);
http://repo.or.cz/w/wmaker-crm.git/commit/04894e94c8b2055e2f43c2d41acf5863bbd544d6
commit 04894e94c8b2055e2f43c2d41acf5863bbd544d6
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Sun Nov 3 13:08:11 2013 +0100
wrlib: Add support for v5 of the gif_lib API
As reported by Nicolas (nhs), compilation of wrlib is broken when
switching to gif_lib v5.
The API of gif_lib has known little change to provide thread-safe usage,
so we now detect this in configure and and use the functions as appropriate
in gif.c
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4
index ef3f478..8092b8a 100644
--- a/m4/wm_imgfmt_check.m4
+++ b/m4/wm_imgfmt_check.m4
@@ -19,7 +19,7 @@
# WM_IMGFMT_CHECK_GIF
# -------------------
#
-# Check for GIF file support through 'libgif' or 'libungif'
+# Check for GIF file support through 'libgif', 'libungif' or 'giflib v5'
# The check depends on variable 'enable_gif' being either:
# yes - detect, fail if not found
# no - do not detect, disable support
@@ -53,7 +53,17 @@ AS_IF([test "x$enable_gif" = "xno"],
[AC_MSG_ERROR([found $wm_cv_imgfmt_gif but could not find
appropriate header - are you missing libgif-dev package?])])
AS_IF([wm_fn_imgfmt_try_compile "gif_lib.h"
"DGifOpenFileName(filename)" ""],
[wm_cv_imgfmt_gif="$wm_cv_imgfmt_gif version:4"],
- [AC_MSG_ERROR([found $wm_cv_imgfmt_gif and header, but cannot
compile - unsupported version?])])
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [@%:@include <gif_lib.h>
+
+const char *filename = "dummy";],
+ [ int error_code;
+ DGifOpenFileName(filename, &error_code);] )],
+ [wm_cv_imgfmt_gif="$wm_cv_imgfmt_gif version:5"],
+ [AC_MSG_ERROR([found $wm_cv_imgfmt_gif and header, but cannot
compile - unsupported version?])])dnl
+ ]
+ )
CFLAGS="$wm_save_CFLAGS"])
])
AS_IF([test "x$wm_cv_imgfmt_gif" = "xno"],
@@ -62,7 +72,7 @@ AS_IF([test "x$enable_gif" = "xno"],
[supported_gfx="$supported_gfx GIF"
GFXLIBS="$GFXLIBS `echo "$wm_cv_imgfmt_gif" | sed -e 's,
*version:.*,,' `"
AC_DEFINE_UNQUOTED([USE_GIF],
- [1],
+ [`echo "$wm_cv_imgfmt_gif" | sed -e 's,.*version:,,' `],
[defined when valid GIF library with header was found])])
])
AM_CONDITIONAL([USE_GIF], [test "x$enable_gif" != "xno"])dnl
diff --git a/wrlib/gif.c b/wrlib/gif.c
index e1b1a73..acbf7da 100644
--- a/wrlib/gif.c
+++ b/wrlib/gif.c
@@ -48,6 +48,7 @@ RImage *RLoadGIF(const char *file, int index)
GifRecordType recType;
ColorMapObject *colormap;
unsigned char rmap[256], gmap[256], bmap[256];
+ int gif_error;
if (index < 0)
index = 0;
@@ -55,10 +56,17 @@ RImage *RLoadGIF(const char *file, int index)
/* default error message */
RErrorCode = RERR_BADINDEX;
+#if USE_GIF == 4
gif = DGifOpenFileName(file);
+#else /* USE_GIF == 5 */
+ gif = DGifOpenFileName(file, &gif_error);
+#endif
if (!gif) {
- switch (GifLastError()) {
+#if USE_GIF == 4
+ gif_error = GifLastError();
+#endif
+ switch (gif_error) {
case D_GIF_ERR_OPEN_FAILED:
RErrorCode = RERR_OPEN;
break;
@@ -182,6 +190,7 @@ RImage *RLoadGIF(const char *file, int index)
/* yuck! */
goto did_not_get_any_errors;
giferr:
+#if USE_GIF == 4
switch (GifLastError()) {
case D_GIF_ERR_OPEN_FAILED:
RErrorCode = RERR_OPEN;
@@ -193,6 +202,10 @@ RImage *RLoadGIF(const char *file, int index)
RErrorCode = RERR_BADIMAGEFILE;
break;
}
+#else
+ /* With gif_lib v5 there's no way to know what went wrong */
+ RErrorCode = RERR_BADIMAGEFILE;
+#endif
bye:
if (image)
RReleaseImage(image);
http://repo.or.cz/w/wmaker-crm.git/commit/f59b263993983a4e89dc7e51e7fa37c858304937
commit f59b263993983a4e89dc7e51e7fa37c858304937
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Sun Nov 3 13:08:10 2013 +0100
wrlib: Use a Conditional for GIF in the makefile instead of #if in source
The use of the conditionals provided by autotools provides a better result
as they avoid unnecessary compilation.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4
index 4c44b7a..ef3f478 100644
--- a/m4/wm_imgfmt_check.m4
+++ b/m4/wm_imgfmt_check.m4
@@ -64,7 +64,8 @@ AS_IF([test "x$enable_gif" = "xno"],
AC_DEFINE_UNQUOTED([USE_GIF],
[1],
[defined when valid GIF library with header was found])])
- ])dnl
+ ])
+ AM_CONDITIONAL([USE_GIF], [test "x$enable_gif" != "xno"])dnl
]) dnl AC_DEFUN
diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am
index c98a60f..dc379a1 100644
--- a/wrlib/Makefile.am
+++ b/wrlib/Makefile.am
@@ -40,9 +40,11 @@ libwraster_la_SOURCES = ppm.c
png.c jpeg.c - tiff.c - gif.c
+ tiff.c
+if USE_GIF
+libwraster_la_SOURCES += gif.c
+endif
LTCOMPILE2=`echo $(LTCOMPILE) | sed -e s/-fomit-frame-pointer//`
COMPILE2=`echo $(COMPILE) | sed -e s/-fomit-frame-pointer//`
diff --git a/wrlib/gif.c b/wrlib/gif.c
index ebd8729..e1b1a73 100644
--- a/wrlib/gif.c
+++ b/wrlib/gif.c
@@ -22,8 +22,6 @@
#include <config.h>
-#ifdef USE_GIF
-
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -209,5 +207,3 @@ RImage *RLoadGIF(const char *file, int index)
return image;
}
-
-#endif /* USE_GIF */
http://repo.or.cz/w/wmaker-crm.git/commit/45a976b5d47e7968dfee8768c1bf4373015b8593
commit 45a976b5d47e7968dfee8768c1bf4373015b8593
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Sun Nov 3 13:08:09 2013 +0100
configure: Moved detection of GIF support to a dedicated macro
The original check was not compliant with autoconf's syntax, did not
have a very good behaviour for user and was not easy to make evolve.
The new macro:
- uses as much as possible autoconf macros for portability and code
consistency;
- provides a consistent behaviour on yes/no/auto (if user explicitly
enables support, do not silently disable if not found; if library is found
but not the header, complain to let user install it or explicitly disable
support);
- makes uses of shell functions to keep generated configure smaller by
sharing reusable stuff;
- introduces a tracking of unsupported things to be reported to user
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/configure.ac b/configure.ac
index eb944a6..4ebce21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,6 +120,12 @@ AS_IF([test "x$debug" = "xyes"],
AX_CFLAGS_GCC_OPTION([-Wno-deprecated-declarations])
])
+
+dnl Tracking on what is detected for final status
+dnl =============================================
+unsupported=""
+
+
dnl Platform-specific Makefile setup
dnl ================================
AS_CASE(["$host"],
@@ -709,36 +715,13 @@ fi
dnl GIF Support
dnl ============
-gif=yes
-AC_ARG_ENABLE(gif, AS_HELP_STRING([--disable-gif], [disable GIF support
through libgif or libungif]),
- gif=$enableval, gif=yes, gif=no)
-
-if test "$gif" = yes; then
- my_libname=""
- WM_CHECK_LIB(ungif, DGifOpenFileName, [$XLFLAGS $XLIBS])
- if test "x$ac_cv_lib_ungif_DGifOpenFileName" = xyes; then
- my_libname=-lungif
- fi
-dnl
-dnl libungif is the same thing as libgif for all practical purposes.
-dnl
- if test "x$my_libname" = x; then
- WM_CHECK_LIB(gif, DGifOpenFileName, [$XLFLAGS $XLIBS])
- if test "x$ac_cv_lib_gif_DGifOpenFileName" = xyes; then
- my_libname=-lgif
- fi
- fi
-
- if test "$my_libname" != x; then
- WM_CHECK_HEADER(gif_lib.h)
- if test "x$ac_cv_header_gif_lib_h" = xyes; then
- GFXLIBS="$GFXLIBS $my_libname"
- supported_gfx="$supported_gfx GIF"
- AC_DEFINE(USE_GIF, 1, [define if GIF libraries are available (set
by configure)])
- fi
- fi
-fi
-
+AC_ARG_ENABLE(gif,
+ [AS_HELP_STRING([--disable-gif], [disable GIF support through libgif or
libungif])],
+ [AS_CASE(["$enableval"],
+ [yes|no], [],
+ [AC_MSG_ERROR([bad value $enableval for --enable-gif])] )],
+ [enable_gif=auto])
+WM_IMGFMT_CHECK_GIF
dnl TIFF Support
@@ -924,6 +907,7 @@ echo "Installation path for binaries : $_bindir"
echo "Installation path for libraries : $libdir"
echo "Installation path for WPrefs.app : $wprefs_base_dir" | sed -e
's|${prefix}|'"$prefix|"
echo "Supported graphic format libraries : $supported_gfx"
+echo "Unsupported features :$unsupported"
echo "Antialiased text support in WINGs : $xft"
echo "Xinerama extension support : $xinerama"
echo "XRandR extension support : $xrandr"
diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4
new file mode 100644
index 0000000..4c44b7a
--- /dev/null
+++ b/m4/wm_imgfmt_check.m4
@@ -0,0 +1,110 @@
+# wm_imgfmt_check.m4 - Macros to check for image file format support libraries
+#
+# Copyright (c) 2013 Christophe CURIS
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# WM_IMGFMT_CHECK_GIF
+# -------------------
+#
+# Check for GIF file support through 'libgif' or 'libungif'
+# The check depends on variable 'enable_gif' being either:
+# yes - detect, fail if not found
+# no - do not detect, disable support
+# auto - detect, disable if not found
+#
+# When found, append appropriate stuff in GFXLIBS, and append info to
+# the variable 'supported_gfx'
+# When not found, append info to variable 'unsupported'
+AC_DEFUN_ONCE([WM_IMGFMT_CHECK_GIF],
+[AC_REQUIRE([_WM_IMGFMT_CHECK_FUNCTS])
+AS_IF([test "x$enable_gif" = "xno"],
+ [unsupported="$unsupported GIF"],
+ [AC_CACHE_CHECK([for GIF support library], [wm_cv_imgfmt_gif],
+ [wm_cv_imgfmt_gif=no
+ wm_save_LDFLAGS="$LDFLAGS"
+ dnl
+ dnl We check first if one of the known libraries is available
+ for wm_arg in "-lgif" "-lungif" ; do
+ AS_IF([wm_fn_imgfmt_try_link "DGifOpenFileName" "$XLFLAGS $XLIBS
$wm_arg"],
+ [wm_cv_imgfmt_gif="$wm_arg" ; break])
+ done
+ LDFLAGS="$wm_save_LDFLAGS"
+ AS_IF([test "x$enable_gif$wm_cv_imgfmt_gif" = "xyesno"],
+ [AC_MSG_ERROR([explicit GIF support requested but no library
found])])
+ AS_IF([test "x$wm_cv_imgfmt_gif" != "xno"],
+ [dnl
+ dnl A library was found, now check for the appropriate header
+ wm_save_CFLAGS="$CFLAGS"
+ AS_IF([wm_fn_imgfmt_try_compile "gif_lib.h" "return 0" ""],
+ [],
+ [AC_MSG_ERROR([found $wm_cv_imgfmt_gif but could not find
appropriate header - are you missing libgif-dev package?])])
+ AS_IF([wm_fn_imgfmt_try_compile "gif_lib.h"
"DGifOpenFileName(filename)" ""],
+ [wm_cv_imgfmt_gif="$wm_cv_imgfmt_gif version:4"],
+ [AC_MSG_ERROR([found $wm_cv_imgfmt_gif and header, but cannot
compile - unsupported version?])])
+ CFLAGS="$wm_save_CFLAGS"])
+ ])
+ AS_IF([test "x$wm_cv_imgfmt_gif" = "xno"],
+ [unsupported="$unsupported GIF"
+ enable_gif="no"],
+ [supported_gfx="$supported_gfx GIF"
+ GFXLIBS="$GFXLIBS `echo "$wm_cv_imgfmt_gif" | sed -e 's,
*version:.*,,' `"
+ AC_DEFINE_UNQUOTED([USE_GIF],
+ [1],
+ [defined when valid GIF library with header was found])])
+ ])dnl
+]) dnl AC_DEFUN
+
+
+# _WM_IMGFMT_CHECK_FUNCTS
+# -----------------------
+# (internal shell functions)
+#
+# Create 2 shell functions:
+# wm_fn_imgfmt_try_link: try to link against library
+# wm_fn_imgfmt_try_compile: try to compile against header
+#
+AC_DEFUN_ONCE([_WM_IMGFMT_CHECK_FUNCTS],
+[@%:@ wm_fn_imgfmt_try_link FUNCTION LFLAGS
+@%:@ -------------------------------------
+@%:@ Try linking aginst library in $LFLAGS using function named $FUNCTION
+@%:@ Assumes that LDFLAGS have been saved in 'wm_save_LDFLAGS' by caller
+wm_fn_imgfmt_try_link ()
+{
+ LDFLAGS="$wm_save_LDFLAGS $[]2"
+ AC_TRY_LINK_FUNC([$[]1],
+ [wm_retval=0],
+ [wm_retval=1])
+ AS_SET_STATUS([$wm_retval])
+}
+
+@%:@ wm_fn_imgfmt_try_compile HEADER FUNC_CALL CFLAGS
+@%:@ -----------------------------------------
+@%:@ Try to compile using header $HEADER and trying to call a function
+@%:@ using the $FUNC_CALL expression and using extra $CFLAGS in the
+@%:@ compiler's command line
+@%:@ Assumes that CFLAGS have been saved in 'wm_save_CFLAGS' by caller
+wm_fn_imgfmt_try_compile ()
+{
+ CFLAGS="$wm_save_CFLAGS $[]3"
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([@%:@include <$[]1>
+
+const char *filename = "dummy";], [ $[]2;])],
+ [wm_retval=0],
+ [wm_retval=1])
+ AS_SET_STATUS([$wm_retval])
+}
+])
http://repo.or.cz/w/wmaker-crm.git/commit/9fb260d046f96575bb11423549b85b8d284c30e7
commit 9fb260d046f96575bb11423549b85b8d284c30e7
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Sun Nov 3 13:08:08 2013 +0100
Improved ignore for 'm4' macro directory
The previous rule was to ignore the whole directory, while still having
some files tracked inside.
Now we only explicitly ignore the files that have been placed there by the
autotools, so we can have a better view of it in Git when adding stuff.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/.gitignore b/.gitignore
index 0fcf185..77fee96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,12 @@ ltmain.sh
missing
mkinstalldirs
stamp-h1
-m4/
+m4/ld-version-script.m4
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
src/wconfig.h
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 7 +++-
WPrefs.app/Menu.c | 9 +++-
WPrefs.app/editmenu.c | 6 +-
WPrefs.app/editmenu.h | 2 +-
configure.ac | 44 ++++++------------
m4/wm_imgfmt_check.m4 | 121 +++++++++++++++++++++++++++++++++++++++++++++++++
wrlib/Makefile.am | 6 ++-
wrlib/gif.c | 19 ++++++--
8 files changed, 169 insertions(+), 45 deletions(-)
create mode 100644 m4/wm_imgfmt_check.m4
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
