diff options
-rwxr-xr-x | wm-addons/idesk/DEPENDS | 27 | ||||
-rw-r--r-- | wm-addons/idesk/HISTORY | 6 | ||||
-rwxr-xr-x | wm-addons/idesk/PRE_BUILD | 7 | ||||
-rw-r--r-- | wm-addons/idesk/configure.patch | 11 | ||||
-rw-r--r-- | wm-addons/idesk/stat.patch | 11 |
5 files changed, 54 insertions, 8 deletions
diff --git a/wm-addons/idesk/DEPENDS b/wm-addons/idesk/DEPENDS index 19ac9fc3cb..32138b4406 100755 --- a/wm-addons/idesk/DEPENDS +++ b/wm-addons/idesk/DEPENDS @@ -1,8 +1,19 @@ -depends xorg-server && -depends pkgconfig && -depends librsvg2 && -depends imlib2 && -depends libxml2 && -depends gtk+2 && -depends libart_lgpl && -depends pango +depends -sub CXX gcc && +depends pkgconfig && +depends libx11 && +depends imlib2 && + +optional_depends libxext \ + "--enable-shape" \ + "--disable-shape" \ + "for XShape extension support" && + +optional_depends startup-notification \ + "--enable-libsn" \ + "--disable-libsn" \ + "for startup notification support" && + +optional_depends libxft \ + "--enable-xft" \ + "--disable-xft" \ + "for Xft (antialias) support" diff --git a/wm-addons/idesk/HISTORY b/wm-addons/idesk/HISTORY index 2b2eb017a3..4fd47fac1e 100644 --- a/wm-addons/idesk/HISTORY +++ b/wm-addons/idesk/HISTORY @@ -1,3 +1,9 @@ +2018-06-10 Vlad Glagolev <stealth@sourcemage.org> + * DEPENDS: rewritten + * PRE_BUILD: added, to apply patches + * stat.patch: added, to fix build with recent glibc + * configure.patch: added, to fix startup-notification flags + 2015-05-25 Thomas Orgis <sobukus@sourcemage.org> * DETAILS: remove SOURCEFORGE_URL usage (automated) diff --git a/wm-addons/idesk/PRE_BUILD b/wm-addons/idesk/PRE_BUILD new file mode 100755 index 0000000000..a2b497307c --- /dev/null +++ b/wm-addons/idesk/PRE_BUILD @@ -0,0 +1,7 @@ +default_pre_build && +cd "${SOURCE_DIRECTORY}" && + +patch -p0 < "${SPELL_DIRECTORY}/stat.patch" && +patch -p0 < "${SPELL_DIRECTORY}/configure.patch" && + +autoreconf -fi diff --git a/wm-addons/idesk/configure.patch b/wm-addons/idesk/configure.patch new file mode 100644 index 0000000000..6e3a5148b2 --- /dev/null +++ b/wm-addons/idesk/configure.patch @@ -0,0 +1,11 @@ +--- configure.in.orig 2005-09-11 03:14:04.000000000 -0400 ++++ configure.in 2018-06-10 10:39:30.671774766 -0400 +@@ -116,7 +116,7 @@ + AC_ARG_ENABLE( + libsn, [ --enable-libsn include code for LIBSN [default=no]]) + +-if test -n "$enable_libsn"; then ++if test "x$enable_libsn" = "xyes"; then + PKG_CHECK_MODULES(LIBSN, libstartup-notification-1.0 >= 0.5) + AC_MSG_RESULT([yes]) + STARTUP="-DHAVE_STARTUP_NOTIFICATION -DSN_API_NOT_YET_FROZEN=1", diff --git a/wm-addons/idesk/stat.patch b/wm-addons/idesk/stat.patch new file mode 100644 index 0000000000..0d973a3ff3 --- /dev/null +++ b/wm-addons/idesk/stat.patch @@ -0,0 +1,11 @@ +--- src/DesktopConfig.h.orig 2005-08-27 04:52:56.000000000 -0400 ++++ src/DesktopConfig.h 2018-06-10 10:32:47.377993916 -0400 +@@ -29,6 +29,8 @@ + #include "Database.h" + #include "DesktopIconConfig.h" + #include <dirent.h> ++#include <sys/types.h> ++#include <sys/stat.h> + + class DesktopConfig : public AbstractConfig + { |