* [gentoo-commits] repo/gentoo:master commit in: x11-wm/afterstep/, x11-wm/afterstep/files/
@ 2015-10-15 15:50 Ian Stakenvicius
0 siblings, 0 replies; 2+ messages in thread
From: Ian Stakenvicius @ 2015-10-15 15:50 UTC (permalink / raw
To: gentoo-commits
commit: 53d77d95fd8d16be804883d15c1f031cbe118d5f
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 15:49:55 2015 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 15:49:55 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d77d95
x11-wm/afterstep: dropped 2.2.11 due to missing slot deps
Package-Manager: portage-2.2.20.1
x11-wm/afterstep/Manifest | 1 -
x11-wm/afterstep/afterstep-2.2.11-r1.ebuild | 123 ---------------------
.../files/afterstep-2.2.11-configure.patch | 13 ---
.../files/afterstep-2.2.11-execinfo.patch | 84 --------------
4 files changed, 221 deletions(-)
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index f621ccf..7637ba0 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,3 +1,2 @@
-DIST AfterStep-2.2.11.tar.bz2 6126237 SHA256 ca7e872fc4d8320899667087d934e0672a3f38264a5207ea314d3c20242903aa SHA512 cf6663427656162f20cce596f63c7368c66fb336d5865dda5127f5aae123c61d647444336cc4c339ae6c64e5f25e837c0ba8889d30b1298ef26569505e0ff3d9 WHIRLPOOL 057d2420776be19db7ddf69ca7a7a2dae570dcca3b9fad4e56e8c9b4268d1f6c5dc6cbcc45b6caab41b3c06dcf7efe2b06289cf2684ac22a3dc2879282ff898f
DIST AfterStep-2.2.12.tar.bz2 6132233 SHA256 ff15da51d4122b8e0286567052951e11a746e7d878dade9ce37f9217439ffbc8 SHA512 5cac6ce74b24cbcc5b8e8a6f7cc9308e110f0d09597af1fa0a8730d5f5111932a23332629bc4d372fc8d9583a514d97e35f747b17decf8d4ebfe5e3f20cdbbee WHIRLPOOL eca804facc37252ebd8e3b8d02f23b6fc66f8a8895337bcfd5cbd1f88f4e09868d0e2005a8be29be785b1259914bca132da7ac63f584964e535c3108a0182028
DIST AfterStep-2.2.9.tar.bz2 6094706 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148 SHA512 1191d918785d3e57f1921b1df21639eeae3298fb5f0f6e23a551f47afc5f0e0c945bae17b1ab8ba908ab0bd8476f5d358051593ff977c442783f94bd2e655ea5 WHIRLPOOL 49bae7a57f7f25703a8f3cbe4d8f18ba59131c9f1e5018de28f01eaee08e1f39b2f26e685d3d27f2d15ab7623fe88b61fa0997885a8a79b580a5225902bf6381
diff --git a/x11-wm/afterstep/afterstep-2.2.11-r1.ebuild b/x11-wm/afterstep/afterstep-2.2.11-r1.ebuild
deleted file mode 100644
index d657927..0000000
--- a/x11-wm/afterstep/afterstep-2.2.11-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="A feature rich NeXTish window manager"
-HOMEPAGE="http://www.afterstep.org/"
-SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2
- mirror://sourceforge/${PN}/AfterStep-${PV}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa debug dbus gif gtk jpeg cpu_flags_x86_mmx nls png svg tiff xinerama"
-
-RDEPEND="media-libs/freetype
- alsa? ( media-libs/alsa-lib )
- dbus? ( sys-apps/dbus )
- jpeg? ( virtual/jpeg )
- gif? ( >=media-libs/giflib-4.1.0 )
- gtk? ( x11-libs/gtk+:2 )
- png? ( media-libs/libpng:0= )
- svg? ( gnome-base/librsvg:2 )
- tiff? ( media-libs/tiff:0 )
- x11-libs/libICE
- x11-libs/libXext
- x11-libs/libSM
- x11-libs/libXmu
- x11-libs/libXt
- x11-libs/libX11
- x11-libs/libXpm
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
- !!media-libs/libafterimage
- x11-proto/xextproto
- x11-proto/xproto
- xinerama? ( x11-proto/xineramaproto )"
-
-S=${WORKDIR}/AfterStep-${PV}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.2.9-{alpha,ldflags,libpng15}.patch
- epatch "${FILESDIR}"/${PN}-2.2.11-{execinfo,configure}.patch
-
- sed -i -e '/^install:/s:install.alternative ::' Makefile.in || die
- sed -i -e '/CFLAGS="-O3"/d' libAfter{Base,Image}/configure || die
- sed -i -e '/STRIP_BINARIES/s:-s::' autoconf/configure.in || die #252119
- sed -i -e '/--with-builtin-gif/s/$with_gif/no/' autoconf/configure.in || die #253259
-
- pushd autoconf >/dev/null
- eautoreconf
- cp autoconf/config.h.in ./ || die
- cp configure ../ || die
- popd >/dev/null
-
- pushd libAfterBase >/dev/null
- eautoreconf
- popd >/dev/null
-}
-
-src_configure() {
- local myconf
-
- use debug && myconf="--enable-gdb --enable-warn --enable-gprof
- --enable-audit --enable-trace --enable-trace-x"
-
- # Explanation of configure options
- # ================================
- # --with-helpcommand="xterm -e man" - Avoid installing xiterm
- # --with-xpm - Contained in xfree
- # --disable-availability - So we can use complete paths for menuitems
- # --enable-ascp - The AfterStep ControlPanel is abandoned
- # LDCONFIG - bug #265841
-
- LDCONFIG=/bin/true econf \
- $(use_enable alsa) \
- $(use_enable cpu_flags_x86_mmx mmx-optimization) \
- $(use_enable nls i18n) \
- $(use_enable xinerama) \
- $(use_with dbus dbus1) \
- $(use_with gif) \
- $(use_with gtk) \
- $(use_with jpeg) \
- $(use_with png) \
- $(use_with tiff) \
- $(use_with svg) \
- --with-helpcommand="xterm -e man" \
- --disable-availability \
- --disable-staticlibs \
- --enable-ascp=no \
- ${myconf}
-}
-
-src_compile() {
- # gcc: ../libAfterConf/libAfterConf.a: No such file or directory
- # make[1]: *** [PrintDesktopEntries] Error 1
- emake -j1
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # Create a symlink from MonitorWharf to Wharf
- rm "${D}"/usr/bin/MonitorWharf
- dosym /usr/bin/Wharf /usr/bin/MonitorWharf
-
- # Handle the documentation
- dodoc ChangeLog INSTALL NEW* README* TEAM UPGRADE
- cp -pPR TODO "${D}"/usr/share/doc/${PF}/
- dodir /usr/share/doc/${PF}/html
- cp -pPR doc/* "${D}"/usr/share/doc/${PF}/html
- rm "${D}"/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
-
- insinto /usr/share/xsessions
- newins AfterStep.desktop.final AfterStep.desktop
-
- # For desktop managers like GDM or KDE
- exeinto /etc/X11/Sessions
- doexe "${FILESDIR}"/${PN}
-}
diff --git a/x11-wm/afterstep/files/afterstep-2.2.11-configure.patch b/x11-wm/afterstep/files/afterstep-2.2.11-configure.patch
deleted file mode 100644
index 1ed6bd9..0000000
--- a/x11-wm/afterstep/files/afterstep-2.2.11-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/autoconf/configure.in b/autoconf/configure.in
-index 4170f98..a16388e 100644
---- a/autoconf/configure.in
-+++ b/autoconf/configure.in
-@@ -105,7 +105,7 @@ AC_ARG_ENABLE(send-postcard-to-developer, [ --enable-send-postcard-to-developer
- AC_ARG_ENABLE(data-reinstall, [ --enable-data-reinstall will prevent AfterStep from reinstalling image and font files.[[yes]] ],data_reinstall=$enableval,data_reinstall="yes")
-
- AC_ARG_ENABLE(script, [ --enable-script compile Script module [[yes]] ], enable_script=$enableval,enable_script="yes")
--AC_ARG_ENABLE(reuse-font, [ --enable-reuse-font enables reuse of loaded font resource by modules (don't use with TrueType fonts !)[[no]] ],[if test x$enableval == "xyes"; then AC_DEFINE(MODULE_REUSE_LOADED_FONT,1,Enables reuse of loaded font resource by modules) fi])
-+AC_ARG_ENABLE(reuse-font, [ --enable-reuse-font enables reuse of loaded font resource by modules (don't use with TrueType fonts !)[[no]] ],[if test x$enableval = "xyes"; then AC_DEFINE(MODULE_REUSE_LOADED_FONT,1,Enables reuse of loaded font resource by modules) fi])
-
- dnl# For FreeBSD, add -I/usr/local/include
-
diff --git a/x11-wm/afterstep/files/afterstep-2.2.11-execinfo.patch b/x11-wm/afterstep/files/afterstep-2.2.11-execinfo.patch
deleted file mode 100644
index 61f4f08..0000000
--- a/x11-wm/afterstep/files/afterstep-2.2.11-execinfo.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/libAfterBase/configure.in b/libAfterBase/configure.in
-index de055ea..eb5619e 100644
---- a/libAfterBase/configure.in
-+++ b/libAfterBase/configure.in
-@@ -189,6 +189,8 @@ AC_CHECK_HEADERS(elf.h,[AC_CHECK_DECLS([ElfW],,,[#include <link.h>])
- AC_CHECK_MEMBERS([Elf32_Dyn.d_tag, Elf64_Dyn.d_tag],,,[#include <elf.h>])
- AC_CHECK_TYPES([Elf64_Addr, Elf32_Addr],,,[#include <elf.h>])])
-
-+AC_CHECK_LIB([execinfo], [backtrace], [LIBS="$LIBS -lexecinfo"; lib_execinfo="-lexecinfo"])
-+
- dnl# this is needed for self diagnostic code :
- AC_CHECK_FUNCS(backtrace_symbols_fd backtrace_symbols backtrace)
-
-@@ -257,6 +257,7 @@ AC_SUBST(lib_file_name)
- AC_SUBST(with_locale)
- AC_SUBST(user_ldflags)
- AC_SUBST(x_libs)
-+AC_SUBST(lib_execinfo)
- AC_SUBST(X_CFLAGS)
- AC_SUBST(LIBPROG)
- AC_SUBST(LIBINSTALL)
-diff --git a/libAfterBase/Makefile.in b/libAfterBase/Makefile.in
-index f04be29..c3bacbb 100644
---- a/libAfterBase/Makefile.in
-+++ b/libAfterBase/Makefile.in
-@@ -80,6 +80,7 @@ INCLUDES = $(INCS_X) $(INCS_PRIVATE)
-
- USER_LD_FLAGS = @user_ldflags@
- LIBS_X = @x_libs@
-+LIB_EXECINFO = @lib_execinfo@
-
-
- LIBDIR = $(DESTDIR)@libdir@
-@@ -326,7 +327,7 @@ $(LIB_SHARED).$(LIBVERMAJOR): $(LIB_SHARED).$(LIBVER)
-
- $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS)
- $(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
-- $(USER_LD_FLAGS) $(LIBS_X) $(LIB_OBJS)
-+ $(USER_LD_FLAGS) $(LIB_OBJS) $(LIBS_X) $(LIB_EXECINFO)
-
- install: install.lib
-
-diff --git a/autoconf/Makefile.defines.in b/autoconf/Makefile.defines.in
-index e6c283f..f8cae5e 100644
---- a/autoconf/Makefile.defines.in
-+++ b/autoconf/Makefile.defines.in
-@@ -40,6 +40,7 @@ LIBS_READLINE = @readline_libs@
- LIBS_X = @x_libs@
- LIBS_ALSA = @ALSA_LIBS@
- LIBS_XEXTS =
-+LIB_EXECINFO = @lib_execinfo@
- LIB_AFTERBASE = @AFTERBASE_LIB@
- LIB_AFTERIMAGE = @AFTERIMAGE_LIB@
- LIB_AFTERSTEP = @AFTERSTEP_LIB@
-@@ -53,7 +54,7 @@ LIB_AFTERCONF_STATIC = @AFTERCONF_STATIC_LIB@
- LIB_ASGTK_STATIC = @ASGTK_STATIC_LIB@
- LIB_WIDGETS_STATIC = @WIDGETS_STATIC_LIB@
- LIBS_AFTERIMAGE = @AFTERIMAGE_LIBS@
--LIBRARIES = $(USER_LD_FLAGS) $(LIBS_PRIVATE) $(LIBS_XEXTS) $(LIBS_X)
-+LIBRARIES = $(USER_LD_FLAGS) $(LIBS_PRIVATE) $(LIBS_XEXTS) $(LIBS_X) $(LIB_EXECINFO)
-
- LIBS_ALL = $(LIBRARIES) $(EXTRA_LIBRARIES)
-
-diff --git a/autoconf/configure.in b/autoconf/configure.in
-index 45add70..4170f98 100644
---- a/autoconf/configure.in
-+++ b/autoconf/configure.in
-@@ -651,6 +651,8 @@ if test "x$send_postcard_to_developer" = "xyes"; then
- AC_DEFINE(DO_SEND_POSTCARD,1,E-mail installation notification to AfterStep developers)
- fi
-
-+AC_CHECK_LIB([execinfo],[backtrace],[lib_execinfo="-lexecinfo"])
-+
- AC_CANONICAL_TARGET
- AC_SUBST(build)
- AC_SUBST(build_os)
-@@ -718,6 +720,7 @@ AC_SUBST(with_desktops)
- AC_SUBST(with_desktops_1)
- AC_SUBST(with_deskgeometry)
- AC_SUBST(no_data_reinstall)
-+AC_SUBST(lib_execinfo)
- dnl# old stuff :
- AC_SUBST(enable_different_looknfeels)
- AC_SUBST(enable_pagerbackground)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/afterstep/, x11-wm/afterstep/files/
@ 2017-08-03 13:01 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2017-08-03 13:01 UTC (permalink / raw
To: gentoo-commits
commit: d770cc658c2cca931948f688d8c7bdf661d230b1
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 3 13:01:09 2017 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Aug 3 13:01:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d770cc65
x11-wm/afterstep: Fix building with gcc5 (#574184) and sandbox violations (#568694)
Package-Manager: Portage-2.3.6, Repoman-2.3.2
x11-wm/afterstep/afterstep-2.2.12.ebuild | 4 +-
x11-wm/afterstep/files/afterstep-2.2.12-gcc5.patch | 227 +++++++++++++++++++++
2 files changed, 230 insertions(+), 1 deletion(-)
diff --git a/x11-wm/afterstep/afterstep-2.2.12.ebuild b/x11-wm/afterstep/afterstep-2.2.12.ebuild
index 9df5af61a18..b4820928c10 100644
--- a/x11-wm/afterstep/afterstep-2.2.12.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -45,6 +45,8 @@ src_prepare() {
sed -i -e '/CFLAGS="-O3"/d' libAfter{Base,Image}/configure || die
sed -i -e '/STRIP_BINARIES/s:-s::' autoconf/configure.in || die #252119
sed -i -e '/--with-builtin-gif/s/$with_gif/no/' autoconf/configure.in || die #253259
+ sed -i -e 's/install.bin install.alternative/install.bin/' src/afterstep/Makefile.in || die #568694
+ epatch "${FILESDIR}"/${P}-gcc5.patch #574184
pushd autoconf >/dev/null
eautoreconf
diff --git a/x11-wm/afterstep/files/afterstep-2.2.12-gcc5.patch b/x11-wm/afterstep/files/afterstep-2.2.12-gcc5.patch
new file mode 100644
index 00000000000..9447bcf990d
--- /dev/null
+++ b/x11-wm/afterstep/files/afterstep-2.2.12-gcc5.patch
@@ -0,0 +1,227 @@
+From: Robert Luberda <robert@debian.org>
+Date: Sun, 22 Mar 2015 16:35:31 +0100
+Subject: 44 Fix build with gcc 5
+
+Remove `inline' keywords from header files, and fix implicit
+declaration warnings to make the code compile with gcc 5, which
+have the c99 standard enabled by default.
+
+Bug-Debian: https://bugs.debian.org/777768
+---
+ libAfterBase/asvector.h | 2 +-
+ libAfterBase/output.h | 2 +-
+ libAfterBase/parse.h | 2 +-
+ libAfterConf/Feel.c | 2 ++
+ libAfterStep/colorscheme.c | 2 +-
+ libAfterStep/event.c | 2 +-
+ libAfterStep/functions.h | 2 +-
+ libAfterStep/mylook.h | 8 ++++----
+ libAfterStep/session.h | 2 +-
+ src/WinList2/WinList.c | 2 +-
+ src/afterstep/asinternals.h | 9 +++++++--
+ src/afterstep/events.c | 1 +
+ src/afterstep/menuitem.c | 2 ++
+ 13 files changed, 24 insertions(+), 14 deletions(-)
+
+diff --git a/libAfterBase/asvector.h b/libAfterBase/asvector.h
+index 242bbb8..ec83231 100644
+--- a/libAfterBase/asvector.h
++++ b/libAfterBase/asvector.h
+@@ -38,7 +38,7 @@ ASVector *append_vector( ASVector *v, void * data, size_t size );
+ /* returns index on success, -1 on failure */
+ int vector_insert_elem( ASVector *v, void *data, size_t size, void *sibling, int before );
+ int vector_relocate_elem (ASVector *v, unsigned int index, unsigned int new_index);
+-inline size_t vector_find_data (ASVector *v, void *data );
++size_t vector_find_data (ASVector *v, void *data );
+ int vector_find_elem( ASVector *v, void *data );
+ /* returns 1 on success, 0 on failure */
+ int vector_remove_elem( ASVector *v, void *data );
+diff --git a/libAfterBase/output.h b/libAfterBase/output.h
+index fd186a7..ef21919 100644
+--- a/libAfterBase/output.h
++++ b/libAfterBase/output.h
+@@ -56,7 +56,7 @@ Bool show_debug( const char *file, const char *func, int line, const char *msg_f
+
+
+ void nonGNUC_debugout( const char *format, ...);
+-inline void nonGNUC_debugout_stub( const char *format, ...);
++void nonGNUC_debugout_stub( const char *format, ...);
+ /* may be used below in case compilation problems occur.
+ * Please submit a bug report if usage of any of the following generates errors on
+ * your compiler . Thanks!!! */
+diff --git a/libAfterBase/parse.h b/libAfterBase/parse.h
+index 193fbba..e4db499 100644
+--- a/libAfterBase/parse.h
++++ b/libAfterBase/parse.h
+@@ -73,7 +73,7 @@ format_geometry ( int x, int y, unsigned int width, unsigned int height, int fla
+
+ double parse_math(const char* str, char** endptr, double size);
+
+-inline int unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val);
++int unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val);
+ char *string_from_int (int param);
+ char *hex_to_buffer_reverse(void *data, size_t bytes, char* buffer);
+ char *hex_to_buffer(void *data, size_t bytes, char* buffer);
+diff --git a/libAfterConf/Feel.c b/libAfterConf/Feel.c
+index 0f2224b..787964d 100644
+--- a/libAfterConf/Feel.c
++++ b/libAfterConf/Feel.c
+@@ -29,6 +29,8 @@
+
+ #include "afterconf.h"
+
++#include <X11/XKBlib.h>
++
+
+ flag_options_xref WindowBoxFlagsXref[] = {
+ {ASA_Virtual, WINDOWBOX_Virtual_ID, 0}
+diff --git a/libAfterStep/colorscheme.c b/libAfterStep/colorscheme.c
+index 6cdeb56..5b93107 100644
+--- a/libAfterStep/colorscheme.c
++++ b/libAfterStep/colorscheme.c
+@@ -162,7 +162,7 @@ static inline ARGB32 MAKE_ARGB32_SHADE100 (CARD32 a, int s100)
+ return MAKE_ARGB32_GREY8 (a, s8);
+ }
+
+-inline void
++static inline void
+ make_mono_grad_argb (ARGB32 * grad, ARGB32 base_alpha16, int shade100,
+ int *val_ret)
+ {
+diff --git a/libAfterStep/event.c b/libAfterStep/event.c
+index a27759b..8c7a449 100644
+--- a/libAfterStep/event.c
++++ b/libAfterStep/event.c
+@@ -202,7 +202,7 @@ void sync_event_queue (Bool forget)
+ /****************************************************************************
+ * Records the time of the last processed event. Used in XSetInputFocus
+ ****************************************************************************/
+-inline Time stash_event_time (XEvent * xevent)
++static inline Time stash_event_time (XEvent * xevent)
+ {
+ if (xevent->type < LASTEvent) {
+ register Time *ptime =
+diff --git a/libAfterStep/functions.h b/libAfterStep/functions.h
+index fb565f1..a50f4e3 100644
+--- a/libAfterStep/functions.h
++++ b/libAfterStep/functions.h
+@@ -314,7 +314,7 @@ FunctionCode change_func_code (const char *func_name, FunctionCode new_code);
+ void init_func_data (FunctionData * data);
+ void copy_func_data (FunctionData * dst, FunctionData * src);
+ void dup_func_data (FunctionData * dst, FunctionData * src);
+-inline FunctionData *create_named_function( int func, char *name);
++FunctionData *create_named_function( int func, char *name);
+ void set_func_val (FunctionData * data, int arg, int value);
+ int free_func_data (FunctionData * data);
+ void destroy_func_data( FunctionData **pdata );
+diff --git a/libAfterStep/mylook.h b/libAfterStep/mylook.h
+index 7bff0b8..a002aa8 100644
+--- a/libAfterStep/mylook.h
++++ b/libAfterStep/mylook.h
+@@ -397,7 +397,7 @@ void myback_delete( MyBackground **myback, ASImageManager *imman );
+ MyDesktopConfig *create_mydeskconfig( int desk, char *data );
+ void init_deskconfigs_list( MyLook *look );
+ void mydeskconfig_delete( MyDesktopConfig **dc );
+-inline MyDesktopConfig *add_deskconfig_to_list( ASHashTable *list, MyDesktopConfig *dc );
++MyDesktopConfig *add_deskconfig_to_list( ASHashTable *list, MyDesktopConfig *dc );
+ MyDesktopConfig *add_deskconfig( MyLook *look, MyDesktopConfig *dc );
+
+ ARGB32 get_random_tint_color();
+@@ -411,9 +411,9 @@ void mylook_set_font_size_var (MyLook * look);
+
+
+ struct MyStyle *mylook_get_style(MyLook *look, const char *name);
+-inline MyBackground *mylook_get_desk_back(MyLook *look, long desk);
+-inline MyBackground *mylook_get_back(MyLook *look, char *name);
+-inline MyDesktopConfig *mylook_get_desk_config(MyLook *look, long desk);
++MyBackground *mylook_get_desk_back(MyLook *look, long desk);
++MyBackground *mylook_get_back(MyLook *look, char *name);
++MyDesktopConfig *mylook_get_desk_config(MyLook *look, long desk);
+
+
+
+diff --git a/libAfterStep/session.h b/libAfterStep/session.h
+index 536e225..73945d8 100644
+--- a/libAfterStep/session.h
++++ b/libAfterStep/session.h
+@@ -49,7 +49,7 @@ void destroy_assession (ASSession * session);
+ void update_default_session ( ASSession *session, int func);
+
+ void set_session_override(ASSession * session, const char *overriding_file, int function );
+-inline const char *get_session_override(ASSession * session, int function );
++const char *get_session_override(ASSession * session, int function );
+
+ void change_default_session (ASSession * session, const char *new_val, int function);
+ void change_desk_session (ASSession * session, int desk, const char *new_val, int function);
+diff --git a/src/WinList2/WinList.c b/src/WinList2/WinList.c
+index 6db35ac..6c98f38 100644
+--- a/src/WinList2/WinList.c
++++ b/src/WinList2/WinList.c
+@@ -976,7 +976,7 @@ moveresize_main_canvas( int width, int height )
+ void
+ postponed_rearrange_winlist( void *vdata )
+ {
+- Bool dont_resize_main_canvas = (Bool)vdata ;
++ Bool dont_resize_main_canvas = vdata != NULL;
+ rearrange_winlist_window( dont_resize_main_canvas );
+ }
+
+diff --git a/src/afterstep/asinternals.h b/src/afterstep/asinternals.h
+index 81b3249..9f75fd8 100644
+--- a/src/afterstep/asinternals.h
++++ b/src/afterstep/asinternals.h
+@@ -575,6 +575,7 @@ void asdbus_shutdown();
+ void asdbus_process_messages ();
+
+ char *asdbus_RegisterSMClient(const char *sm_client_id);
++void asdbus_UnregisterSMClient (const char *sm_client_path);
+ void asdbus_Notify(const char *summary, const char *body, int timeout);
+
+ typedef enum {
+@@ -585,6 +586,10 @@ typedef enum {
+
+ Bool asdbus_GetCanLogout ();
+ Bool asdbus_Logout (ASDbusLogoutMode mode, int timeout);
++Bool asdbus_GetCanSuspend ();
++Bool asdbus_Suspend (int timeout);
++Bool asdbus_GetCanHibernate ();
++Bool asdbus_Hibernate (int timeout);
+ Bool asdbus_GetCanShutdown ();
+ Bool asdbus_Shutdown (int timeout);
+ Bool get_gnome_autosave ();
+@@ -689,8 +694,8 @@ void ParsePopupEntry (char *tline, FILE * fd, char **junk, int *junk2);
+
+
+ /*************************** misc.c *********************************/
+-inline void ungrab_window_buttons( Window w );
+-inline void ungrab_window_keys (Window w );
++void ungrab_window_buttons( Window w );
++void ungrab_window_keys (Window w );
+ void MyXGrabButton ( unsigned button, unsigned modifiers,
+ Window grab_window, Bool owner_events, unsigned event_mask,
+ int pointer_mode, int keyboard_mode, Window confine_to, Cursor cursor);
+diff --git a/src/afterstep/events.c b/src/afterstep/events.c
+index 5588ffb..19e5441 100644
+--- a/src/afterstep/events.c
++++ b/src/afterstep/events.c
+@@ -46,6 +46,7 @@
+ #include "../../libAfterStep/moveresize.h"
+
+ #include <X11/keysym.h>
++#include <X11/XKBlib.h>
+ #ifdef XSHMIMAGE
+ # include <sys/ipc.h>
+ # include <sys/shm.h>
+diff --git a/src/afterstep/menuitem.c b/src/afterstep/menuitem.c
+index 1adcb65..8a35186 100644
+--- a/src/afterstep/menuitem.c
++++ b/src/afterstep/menuitem.c
+@@ -55,6 +55,8 @@
+
+ #include "dirtree.h"
+
++#include <X11/XKBlib.h>
++
+ /***************************************************************************/
+ /* Menu functions */
+ /***************************************************************************/
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-03 13:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-15 15:50 [gentoo-commits] repo/gentoo:master commit in: x11-wm/afterstep/, x11-wm/afterstep/files/ Ian Stakenvicius
-- strict thread matches above, loose matches on Subject: below --
2017-08-03 13:01 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox