Permalink
Browse files

FL-799: fork back icewm with dep fix

  • Loading branch information...
angryvincent committed Oct 1, 2013
1 parent 26df6fe commit e63ce53af84cf579c91533dddc7fb2c49f0e240c
View
@@ -0,0 +1 @@
+DIST icewm-1.3.7.tar.gz 898197 SHA256 ca1a78046ae340c324c441ce24a9675c24a8bafd3eb6ed8205345785da08887b SHA512 b0c09b19d1a6df3acf03eda364716b5a8516011c760806087fd6315ccf2a5c926471db56079b46d8fab01db87ea42a809a66fe3088b6ad8575e41a000914e895 WHIRLPOOL 8ea9ade64b2d6eadedb35ec146096fd6c3986142ff14d718c789315aaf3bfb1ef9afcb5206ee2286bc01f3775373428d5b969e3e632e87eb2bf1e49a3d03b9ef
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=IceWM
+Comment=This session logs you into IceWM
+Exec=icewm-session
+TryExec=icewm-session
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
View
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/icewm-session
@@ -0,0 +1,26 @@
+diff -NrU5 icewm-1.2.37.original/configure.in icewm-1.2.37/configure.in
+--- icewm-1.2.37.original/configure.in 2009-11-16 15:16:24.000000000 -0600
++++ icewm-1.2.37/configure.in 2009-11-16 16:15:13.000000000 -0600
+@@ -818,19 +818,19 @@
+ [ if test "${enable_menus_gnome2}" = "yes"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config)
+
+ if test "${PKG_CONFIG}" != ""; then
+ GNOME_VER=2
+- GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0`
+- GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0`
++ GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
++ GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
+
+ AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])
+
+ APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"
+ GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
+ GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"
+- CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/"
++ CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/"
+ fi
+
+ if test "${GNOME2_CFLAGS}" = ""; then
+ AC_MSG_ERROR([gnome 2 can not be found via pkg-config.
+ *** Install the GNOME´s development packages.])
@@ -0,0 +1,21 @@
+Description: Don't use "deprecated" as identifier, will FTBFS if another
+ library defines functions as deprecated.
+Author: Andreas Moog <amoog@ubuntu.com>
+Bug: https://sourceforge.net/tracker/?func=detail&aid=3494034&group_id=31&atid=100031
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/935179
+Forwarded: Yes
+
+--- icewm-1.3.7.orig/src/base.h
++++ icewm-1.3.7/src/base.h
+@@ -2,9 +2,9 @@
+ #define __BASE_H
+
+ #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
+-#define deprecated __attribute__((deprecated))
++#define ICEWM_deprecated __attribute__((deprecated))
+ #else
+-#define deprecated
++#define ICEWM_deprecated
+ #endif
+
+ /*** Atomar Data Types ********************************************************/
@@ -0,0 +1,219 @@
+Index: icewm-1.3.7/po/Makefile.in
+===================================================================
+--- icewm-1.3.7.orig/po/Makefile.in 2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/po/Makefile.in 2013-06-28 18:46:58.940864492 +0200
+@@ -20,6 +20,7 @@
+ XGETTEXT = @XGETTEXT@
+ MSGMERGE = @MSGMERGE@
+ MSGFMT = @MSGFMT@
++VPATH = .:po:@srcdir@
+
+ .SUFFIXES:
+ .SUFFIXES: .po .mo
+Index: icewm-1.3.7/src/WinMgr.h
+===================================================================
+--- icewm-1.3.7.orig/src/WinMgr.h 2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/src/WinMgr.h 2013-06-28 18:46:58.940864492 +0200
+@@ -128,7 +128,7 @@
+ * this where WIN_WORKSPACE_COUNT comes into play.
+ */
+
+-#define WinWorkspaceInvalid (-1L)
++#define WinWorkspaceInvalid ((unsigned long)-1)
+
+ /* workspaces */
+ #define XA_WIN_WORKSPACES "_WIN_WORKSPACES"
+Index: icewm-1.3.7/src/yfont.cc
+===================================================================
+--- icewm-1.3.7.orig/src/yfont.cc 2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/src/yfont.cc 2013-06-28 18:46:58.940864492 +0200
+@@ -12,7 +12,7 @@
+
+ extern ref<YFont> getXftFont(ustring name, bool antialias);
+ extern ref<YFont> getXftFontXlfd(ustring name, bool antialias);
+-extern ref<YFont> getCoreFont(ustring name);
++extern ref<YFont> getCoreFont(const char*);
+
+ #ifdef CONFIG_XFREETYPE
+ ref<YFont> YFont::getFont(ustring name, ustring xftFont, bool antialias) {
+@@ -46,7 +46,9 @@
+ #endif
+
+ #ifdef CONFIG_COREFONTS
+- return getCoreFont(name);
++ char tmp[4096]; // XXX: such things should go into getCoreFont directly
++ name.copy(tmp, sizeof(tmp));
++ return getCoreFont(tmp);
+ #else
+ return null;
+ #endif
+Index: icewm-1.3.7/src/yapp.cc
+===================================================================
+--- icewm-1.3.7.orig/src/yapp.cc 2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/src/yapp.cc 2013-06-28 18:46:58.944864245 +0200
+@@ -269,7 +269,7 @@
+ }
+ #endif
+
+- {
++ if(measure_latency) {
+ struct timeval difftime;
+ struct timeval curtime;
+ gettimeofday(&curtime, 0);
+Index: icewm-1.3.7/src/Makefile.in
+===================================================================
+--- icewm-1.3.7.orig/src/Makefile.in 2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/src/Makefile.in 2013-06-28 18:46:58.944864245 +0200
+@@ -11,7 +11,7 @@
+
+ CXX = @CXX@
+ HOSTCXX = @HOSTCXX@
+-LD = @CXX_LINK@
++LD = gcc
+ HOSTLD = @HOSTCXX_LINK@
+ EXEEXT = @EXEEXT@
+
+@@ -32,12 +32,12 @@
+ -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
+ -DICESMEXE='"icewm-session$(EXEEXT)"' \
+ -DICEHELPEXE='"icehelp$(EXEEXT)"' \
+- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
++ -DICEHELPIDX='"$(DOCDIR)/icewm-common/icewm.html"'
+
+ CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
+- @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
++ @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ -I. # `fc-config --cflags`
+ LFLAGS = @LDFLAGS@
+-LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs`
++LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` -lfontconfig -lm -lsupc++
+
+ CORE_LIBS = @CORE_LIBS@ # `fc-config --libs`
+ IMAGE_LIBS = @IMAGE_LIBS@
+@@ -192,6 +192,8 @@
+ TESTCASES = @TESTCASES@
+ OBJECTS = @BASEOBJS@ @TESTOBJS@
+ BINARIES = @BASEBINS@ @TESTBINS@
++BASEOBJS = @BASEOBJS@
++VPATH = .:@srcdir@
+
+ ################################################################################
+
+@@ -209,7 +211,8 @@
+ @echo " CXX " $@
+ @$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
+
+-$(BINARIES):
++$(BINARIES): $(BASEOBJS)
++# @$(MAKE) --no-print-directory build-dep DEPLIST="$($(@:$(EXEEXT)=)_OBJS)"
+ @echo " LD " $@
+ @$(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS)
+
+@@ -245,6 +248,8 @@
+
+ genpref$(EXEEXT): $(genpref_OBJS)
+
++build-dep: $(DEPLIST)
++
+ ################################################################################
+
+ check: all tests
+Index: icewm-1.3.7/Makefile.in
+===================================================================
+--- icewm-1.3.7.orig/Makefile.in 2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/Makefile.in 2013-06-28 18:46:58.944864245 +0200
+@@ -4,6 +4,8 @@
+ # Please run 'configure' first (generate it with autogen.sh)
+ ################################################################################
+
++SHELL=/bin/bash
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+
+@@ -33,7 +35,7 @@
+
+ ################################################################################
+
+-BINFILES = @BINFILES@ icewm-set-gnomewm
++BINFILES = @BINFILES@ "$(srcdir)/icewm-set-gnomewm"
+ LIBFILES = lib/preferences lib/winoptions lib/keys \
+ lib/menu lib/toolbar # lib/programs
+ DOCFILES = README BUGS CHANGES COPYING AUTHORS INSTALL VERSION icewm.lsm
+@@ -46,21 +48,22 @@
+ install: @TARGETS_INSTALL@
+
+ base icesound icehelp:
+- @cd src; $(MAKE) $@
++ @cd src && $(MAKE) $@
+
+ docs:
+- @cd doc; $(MAKE) all
++ @cd doc && $(MAKE) all
+
+ nls:
+- @cd po; $(MAKE) all
++ @cd po && $(MAKE) all
+
+ srcclean:
+- @cd src; $(MAKE) clean
++ @cd src && $(MAKE) clean
+
+ clean: srcclean
+- @cd doc; $(MAKE) clean
++ @cd doc && $(MAKE) clean
+
+-distclean: clean
++distclean:
++ @-$(MAKE) clean
+ rm -f *~ config.cache config.log config.status install.inc \
+ sysdep.inc src/config.h \
+ lib/preferences \
+@@ -68,10 +71,10 @@
+
+ maintainer-clean: distclean
+ rm -f icewm.spec icewm.lsm Makefile configure src/config.h.in
+- @cd doc; $(MAKE) maintainer-clean
++ @cd doc && $(MAKE) maintainer-clean
+
+ check:
+- @cd src ; $(MAKE) check >/dev/null
++ @cd src && $(MAKE) check >/dev/null
+
+ dist: distclean docs configure
+
+@@ -80,21 +83,23 @@
+ @echo ------------------------------------------
+ @echo "Installing binaries in $(DESTDIR)$(BINDIR)"
+ @$(INSTALLDIR) "$(DESTDIR)$(BINDIR)"
++#generated files, relative to the build directory
+ @for bin in $(BINFILES); do \
+ $(INSTALLBIN) "$${bin}" "$(DESTDIR)$(BINDIR)"; \
+ done
+
+ @echo "Installing presets and icons in $(DESTDIR)$(LIBDIR)"
+ @$(INSTALLDIR) "$(DESTDIR)$(LIBDIR)"
++# data files from the source directory
+ #-@$(INSTALLDIR) "$(DESTDIR)$(CFGDIR)"
+ @for lib in $(LIBFILES); do \
+- $(INSTALLLIB) "$${lib}" "$(DESTDIR)$(LIBDIR)"; \
++ $(INSTALLLIB) "$(top_srcdir)/$${lib}" "$(DESTDIR)$(LIBDIR)"; \
+ done
+
+ @for xpmdir in $(XPMDIRS); do \
+- if test -d "lib/$${xpmdir}"; then \
++ if test -d "$(top_srcdir)/lib/$${xpmdir}"; then \
+ $(INSTALLDIR) "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \
+- for pixmap in "lib/$${xpmdir}/"*.xpm; do \
++ for pixmap in "$(top_srcdir)/lib/$${xpmdir}/"*.xpm; do \
+ $(INSTALLLIB) "$${pixmap}" "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \
+ done; \
+ fi; \
+@@ -126,7 +131,7 @@
+
+ install-nls: nls
+ @echo ------------------------------------------
+- @cd po; $(MAKE) install
++ @cd po && $(MAKE) install
+ @echo ------------------------------------------
+
+ install-man:
@@ -0,0 +1,19 @@
+--- icewm-1.3.7/src/decorate.cc.old 2012-06-10 10:59:22.496484163 +0300
++++ icewm-1.3.7/src/decorate.cc 2012-06-10 11:00:05.453078780 +0300
+@@ -320,6 +320,7 @@
+ YWindow::configure(r);
+
+ performLayout();
++ sendConfigure();
+ }
+
+ void YFrameWindow::performLayout()
+@@ -331,8 +332,6 @@
+ layoutShape();
+ if (affectsWorkArea())
+ manager->updateWorkArea();
+-
+- sendConfigure();
+ }
+
+ void YFrameWindow::layoutTitleBar() {
@@ -0,0 +1,14 @@
+--- icewm-1.3.7/src/base.h.old 2010-10-31 16:09:36.000000000 +0200
++++ icewm-1.3.7/src/base.h 2012-06-10 11:08:34.643875363 +0300
+@@ -2,7 +2,11 @@
+ #define __BASE_H
+
+ #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
++#if ( __GNUC__ == 4 && __GNUC_MINOR__ > 7 ) || __GNUC__ > 3
++#define __icewm_deprecated __attribute__((deprecated))
++#else
+ #define deprecated __attribute__((deprecated))
++#endif
+ #else
+ #define deprecated
+ #endif
@@ -0,0 +1,10 @@
+--- configure.in.old 2011-11-23 15:44:52.121654867 +0200
++++ configure.in 2011-11-23 15:47:09.514411391 +0200
+@@ -494,6 +494,7 @@
+ AC_DEFINE(CONFIG_COREFONTS, 1, [Define to enable X11 core conts.])
+ features="${features} corefonts"
+ fi
++ CORE_LIBS="${CORE_LIBS} -lfontconfig"
+
+ dnl ============================================================= GUI Events ===
+ dnl
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/show_bug.cgi?id=376451
+
+--- a/src/wmapp.cc
++++ b/src/wmapp.cc
+@@ -337,7 +337,7 @@
+ char ** fontPath(XGetFontPath(xapp->display(), &ndirs));
+
+ char ** newFontPath = new char *[ndirs + 1];
+- newFontPath[ndirs] = fontsdir;
++ newFontPath[ndirs] = (char *)fontsdir;
+
+ if (fontPath)
+ memcpy(newFontPath, fontPath, ndirs * sizeof (char *));
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/show_bug.cgi?id=424888
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672089#24
+
+--- a/src/yarray.h
++++ b/src/yarray.h
+@@ -152,7 +152,7 @@ public:
+ }
+
+ virtual void remove(const typename YArray<DataType *>::SizeType index) {
+- if (index < YArray<DataType *>::getCount()) delete getItem(index);
++ if (index < YArray<DataType *>::getCount()) delete this->getItem(index);
+ YArray<DataType *>::remove(index);
+ }
+
Oops, something went wrong.

0 comments on commit e63ce53

Please sign in to comment.