icewm 1.2.30 fix build. close #1324

6 files changed, 12 insertions, 133 deletions

diff --git a/packages/icewm/icewm-1.2.20/.mtn2git_empty b/packages/icewm/icewm-1.2.20/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/icewm/icewm-1.2.20/.mtn2git_empty
+++ /dev/null
diff --git a/packages/icewm/icewm-1.2.20/configure.patch b/packages/icewm/icewm-1.2.20/configure.patch
deleted file mode 100644
index d6071bf260..0000000000
--- a/packages/icewm/icewm-1.2.20/configure.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- icewm-1.2.20/configure.in.orig	2006-06-17 18:03:43.000000000 -0600
-+++ icewm-1.2.20/configure.in	2006-06-17 18:03:45.000000000 -0600
-@@ -426,32 +426,43 @@
-      AC_MSG_ERROR("xfreetype or core fonts must be enabled")
-   fi
-   if test "$enable_xfreetype" != "no" -o "$enable_xfreetype" = "implied"; then
--    AC_PATH_PROG(XFT_CONFIG, xft-config,, ${with_xft_arg-${PATH}})
--    if test "${XFT_CONFIG}" != ""; then
--      XFT_CFLAGS=`${XFT_CONFIG} --cflags`
--      XFT_LIBS=`${XFT_CONFIG} --libs`
--      AC_DEFINE(CONFIG_XFREETYPE, 2, [Define to enable XFreeType support.])
--      CORE_CFLAGS="${CORE_CFLAGS} $XFT_CFLAGS"
--      CORE_LIBS="${CORE_LIBS} $XFT_LIBS"
--      features="${features} xfreetype"
--    else
--      AC_CHECK_HEADERS(X11/Xft/Xft.h,
--      [ AC_CHECK_LIB(Xft, XftDrawCreate,
--        [ AC_DEFINE(CONFIG_XFREETYPE, 1, [Define to enable XFreeType support.])
--          CORE_LIBS="${CORE_LIBS} -lXft"
--          enable_corefonts=yes
--          features="${features} xfreetype" ],
--        [ if test "$enable_xfreetype" != "implied"; then
--            AC_MSG_ERROR([Xft support has been requested but libraries were not found.
-+      AC_PATH_PROG(PKG_CONFIG, pkg-config)
-+
-+      if test "${PKG_CONFIG}" != ""; then
-+          XFT_CFLAGS=`${PKG_CONFIG} xft --cflags`
-+          XFT_LIBS=`${PKG_CONFIG} xft --libs`
-+          AC_DEFINE(CONFIG_XFREETYPE, 2, [Define to enable XFreeType support.])
-+          CORE_CFLAGS="${CORE_CFLAGS} $XFT_CFLAGS"
-+          CORE_LIBS="${CORE_LIBS} $XFT_LIBS"
-+          features="${features} xfreetype"
-+      else
-+        AC_PATH_PROG(XFT_CONFIG, xft-config,, ${with_xft_arg-${PATH}})
-+        if test "${XFT_CONFIG}" != ""; then
-+          XFT_CFLAGS=`${XFT_CONFIG} --cflags`
-+          XFT_LIBS=`${XFT_CONFIG} --libs`
-+          AC_DEFINE(CONFIG_XFREETYPE, 2, [Define to enable XFreeType support.])
-+          CORE_CFLAGS="${CORE_CFLAGS} $XFT_CFLAGS"
-+          CORE_LIBS="${CORE_LIBS} $XFT_LIBS"
-+          features="${features} xfreetype"
-+        else
-+          AC_CHECK_HEADERS(X11/Xft/Xft.h,
-+          [ AC_CHECK_LIB(Xft, XftDrawCreate,
-+            [ AC_DEFINE(CONFIG_XFREETYPE, 1, [Define to enable XFreeType support.])
-+              CORE_LIBS="${CORE_LIBS} -lXft"
-+              enable_corefonts=yes
-+              features="${features} xfreetype" ],
-+            [ if test "$enable_xfreetype" != "implied"; then
-+                AC_MSG_ERROR([Xft support has been requested but libraries were not found.
-   *** Configure your X server to support XFreeType.
-   *** Information about how to do this can be found in RELNOTES for XFree86.])
--          fi ])],
--      [ if test "$enable_xfreetype" != "implied"; then
--          AC_MSG_ERROR([Xft support has been requested but headers were not found.
-+              fi ])],
-+            [ if test "$enable_xfreetype" != "implied"; then
-+                AC_MSG_ERROR([Xft support has been requested but headers were not found.
-   *** Configure your X server to support XFreeType.
-   *** Information about how to do this can be found in RELNOTES for XFree86.])
--          fi ])
--    fi
-+              fi ])
-+        fi
-+      fi
-   fi
- 
-   if test "$enable_corefonts" = "yes"; then
diff --git a/packages/icewm/icewm-1.2.20/makefile.patch b/packages/icewm/icewm-1.2.20/makefile.patch
deleted file mode 100644
index 9473c9b2a9..0000000000
--- a/packages/icewm/icewm-1.2.20/makefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./src/Makefile.in	2005-02-01 21:56:08.000000000 +0100
-+++ ./src/Makefile.in	2005-02-01 21:55:12.000000000 +0100
-@@ -206,10 +206,21 @@
- %.o: %.cc
- 	@echo "  CXX   " $@
- 	@$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
--	
--genpref $(BINARIES):
-+
-+HOSTCXX=g++
-+HOSTLD=g++
-+
-+genpref.o: genpref.cc
-+	@echo "  HOSTCXX   " $@
-+	@$(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $<
-+
-+$(BINARIES):
- 	@echo "  LD    " $@
- 	@$(LD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS)
-+	
-+genpref:
-+	@echo "  HOSTLD    " $@
-+	@$(HOSTLD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS)
- 
- ################################################################################
- 
diff --git a/packages/icewm/icewm-1.2.30/makefile.patch b/packages/icewm/icewm-1.2.30/makefile.patch
index 9473c9b2a9..753f6a57a2 100644
--- a/packages/icewm/icewm-1.2.30/makefile.patch
+++ b/packages/icewm/icewm-1.2.30/makefile.patch
@@ -1,26 +1,23 @@
 --- ./src/Makefile.in	2005-02-01 21:56:08.000000000 +0100
 +++ ./src/Makefile.in	2005-02-01 21:55:12.000000000 +0100
-@@ -206,10 +206,21 @@
+@@ -206,10 +206,18 @@
  %.o: %.cc
  	@echo "  CXX   " $@
  	@$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
 -	
 -genpref $(BINARIES):
 +
-+HOSTCXX=g++
-+HOSTLD=g++
-+
 +genpref.o: genpref.cc
-+	@echo "  HOSTCXX   " $@
-+	@$(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $<
++	@echo "  BUILD_CXX   " $@
++	@$(BUILD_CXX) $(BUILD_CXXFLAGS) $(DEBUG) $(DEFS) $(GCCDEP) -c $<
 +
 +$(BINARIES):
  	@echo "  LD    " $@
  	@$(LD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS)
 +	
 +genpref:
-+	@echo "  HOSTLD    " $@
-+	@$(HOSTLD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS)
++	@echo "  BUILD_CXX    " $@
++	@$(BUILD_CXX) $(BUILD_LDFLAGS) -o $@$(EXEEXT) $($@_OBJS) $(LIBS) $($@_LIBS)
  
  ################################################################################
  
diff --git a/packages/icewm/icewm_1.2.20.bb b/packages/icewm/icewm_1.2.20.bb
deleted file mode 100644
index 1567e985e2..0000000000
--- a/packages/icewm/icewm_1.2.20.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SECTION = "x11/wm"
-DESCRIPTION = "IceWM Window Manager"
-LICENSE = "GPL"
-DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
-RRECOMMENDS = "ttf-dejavu-sans"
-PR = "r2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
-	   file://makefile.patch;patch=1 \
-	   file://configure.patch;patch=1"
-
-S = "${WORKDIR}/icewm-${PV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus \
-	--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} \
-	--with-mkfontdir=${STAGING_BINDIR_NATIVE}/mkfontdir"
-
-pkg_postinst() {
-update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/icewm-session 10
-}
-
-pkg_postrm() {
-update-alternatives --remove x-window-manager /usr/bin/icewm-session
-}
diff --git a/packages/icewm/icewm_1.2.30.bb b/packages/icewm/icewm_1.2.30.bb
index 3dfffb1ae8..cd8cfe5bde 100644
--- a/packages/icewm/icewm_1.2.30.bb
+++ b/packages/icewm/icewm_1.2.30.bb
@@ -1,13 +1,15 @@
-SECTION = "x11/wm"
 DESCRIPTION = "IceWM Window Manager"
+SECTION = "x11/wm"
 LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
 RRECOMMENDS = "ttf-dejavu-sans"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
-	   file://makefile.patch;patch=1 \
-	   file://configure.patch;patch=1"
+SRC_URI = "\
+  ${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
+  file://makefile.patch;patch=1 \
+  file://configure.patch;patch=1 \
+"
 
 inherit autotools pkgconfig