pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
icewm17: get rid of patches and try to start fresh.
Module Name: pkgsrc-wip
Committed By: Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By: bsiegert
Date: Sun Aug 9 09:31:04 2020 +0000
Changeset: 73ec22284258a1efb838f98db2214e56cbe32f73
Modified Files:
icewm17/Makefile
icewm17/distinfo
Removed Files:
icewm17/patches/patch-src_CMakeLists.txt
icewm17/patches/patch-src_acpustatus.cc
icewm17/patches/patch-src_base.h
icewm17/patches/patch-src_icesm.cc
icewm17/patches/patch-src_icetray.cc
icewm17/patches/patch-src_wmapp.cc
icewm17/patches/patch-src_wpixres.cc
icewm17/patches/patch-src_yapp.cc
icewm17/patches/patch-src_ylocale.cc
Log Message:
icewm17: get rid of patches and try to start fresh.
This does not work yet.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=73ec22284258a1efb838f98db2214e56cbe32f73
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
icewm17/Makefile | 7 ++--
icewm17/distinfo | 17 +++-------
icewm17/patches/patch-src_CMakeLists.txt | 30 -----------------
icewm17/patches/patch-src_acpustatus.cc | 58 --------------------------------
icewm17/patches/patch-src_base.h | 24 -------------
icewm17/patches/patch-src_icesm.cc | 13 -------
icewm17/patches/patch-src_icetray.cc | 13 -------
icewm17/patches/patch-src_wmapp.cc | 13 -------
icewm17/patches/patch-src_wpixres.cc | 18 ----------
icewm17/patches/patch-src_yapp.cc | 13 -------
icewm17/patches/patch-src_ylocale.cc | 40 ----------------------
11 files changed, 6 insertions(+), 240 deletions(-)
diffs:
diff --git a/icewm17/Makefile b/icewm17/Makefile
index d638fa9bb3..ad3afa19ef 100644
--- a/icewm17/Makefile
+++ b/icewm17/Makefile
@@ -1,12 +1,9 @@
# $NetBSD: Makefile,v 1.5 2020/03/08 16:51:33 wiz Exp $
-DISTNAME= icewm-1.4.2
-PKGREVISION= 3
+DISTNAME= icewm-1.7.0
CATEGORIES= wm
MASTER_SITES= ${MASTER_SITE_GITHUB:=bbidulock/}
-GITHUB_RELEASE= ${PKGVERSION_NOREV}
-EXTRACT_SUFX= .tar.bz2
-EXTRACT_USING= gtar
+GITHUB_TAG= ${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.icewm.org/
diff --git a/icewm17/distinfo b/icewm17/distinfo
index 318aae25a9..14b5c2c2fb 100644
--- a/icewm17/distinfo
+++ b/icewm17/distinfo
@@ -1,15 +1,6 @@
$NetBSD: distinfo,v 1.4 2019/12/10 19:22:36 plunky Exp $
-SHA1 (icewm-1.4.2.tar.bz2) = d1f9af531fec7beaa334db9c0e4764b9e40bbacd
-RMD160 (icewm-1.4.2.tar.bz2) = 6aaabad0c235901556951c9d88178adf15e29f51
-SHA512 (icewm-1.4.2.tar.bz2) = 0d227d75d2e3e6e5314eb0990375b85a34496e61e8b504ee023decb52b0c3a20bfd65c0d491b738d3742ddf3f21acfabfc8e4d43df51d137f568580b6c5ed0cd
-Size (icewm-1.4.2.tar.bz2) = 1731772 bytes
-SHA1 (patch-src_CMakeLists.txt) = 87a236a6d53937921ffca0044b1497124f8a9d83
-SHA1 (patch-src_acpustatus.cc) = 7c47b9e7690db4f011c2cfee3c7d5e36080b4b6a
-SHA1 (patch-src_base.h) = 5321f1f1f8fd1ced2c5f38a7e5e614deee4703df
-SHA1 (patch-src_icesm.cc) = c7fa247c395bb36307b7757a8c2698b62b7d0a6e
-SHA1 (patch-src_icetray.cc) = a8e70da376e13be187037f190c672b8b75fd287b
-SHA1 (patch-src_wmapp.cc) = fdabb4348c1dc55d390c942f34aa0fb597f49fc0
-SHA1 (patch-src_wpixres.cc) = aeb0b6423a48e0f3b4074baa2a0a0c9e52e9d8ed
-SHA1 (patch-src_yapp.cc) = f3c8e1d6d0830d4b95d131af37a1f394737a3c48
-SHA1 (patch-src_ylocale.cc) = 099296135053df781bd3755f9947d34d52fd3020
+SHA1 (icewm-1.7.0.tar.gz) = 3c7c1c4332449fb4348d38481ffcb4fb503c5d64
+RMD160 (icewm-1.7.0.tar.gz) = 9f11f544c08f9961f60dab23773b0331c6df4a69
+SHA512 (icewm-1.7.0.tar.gz) = 25c00d05eb63ff2bf10d8748a266ac31170e26a0f7b385734e586fabca1e001616344c9b7cffb925f0ca24722a6ca0fbb6a247fcb2dd4410caa502484f2b7e09
+Size (icewm-1.7.0.tar.gz) = 2192103 bytes
diff --git a/icewm17/patches/patch-src_CMakeLists.txt b/icewm17/patches/patch-src_CMakeLists.txt
deleted file mode 100644
index 98641378a8..0000000000
--- a/icewm17/patches/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.2 2018/11/28 16:24:54 jperkin Exp $
-
---- src/CMakeLists.txt.orig 2017-07-30 08:53:35.524267864 +0000
-+++ src/CMakeLists.txt
-@@ -47,6 +47,7 @@ ENDIF()
- if(ENABLE_NLS OR CONFIG_I18N)
- find_library(CONFIG_LIBICONV iconv)
- if(CONFIG_LIBICONV)
-+ SET(CXXFLAGS_COMMON "${CXXFLAGS_COMMON} -DCONFIG_LIBICONV")
- LIST(APPEND nls_LIBS iconv)
- endif()
- find_library(CONFIG_LIBINTL intl)
-@@ -338,7 +339,7 @@ set(icewm_libs ${sm_LIBS} ${nls_LIBS} ${
- TARGET_LINK_LIBRARIES(icewm${EXEEXT} ${icewm_libs})
-
- ADD_EXECUTABLE(genpref${EXEEXT} genpref.cc misc.cc)
--TARGET_LINK_LIBRARIES(genpref${EXEEXT} ${EXTRA_LIBS})
-+TARGET_LINK_LIBRARIES(genpref${EXEEXT} ${nls_LIBS} ${EXTRA_LIBS})
-
- IF(CONFIG_FDO_MENUS)
- ADD_EXECUTABLE(icewm-menu-fdo${EXEEXT} fdomenu.cc misc.cc)
-@@ -387,7 +388,7 @@ if(NOT CMAKE_CROSSCOMPILING)
- ADD_CUSTOM_COMMAND(TARGET genpref${EXEEXT}
- POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/lib
-- COMMAND genpref${EXEEXT} > lib/preferences
-+ COMMAND genpref${EXEEXT} > ${CMAKE_BINARY_DIR}/lib/preferences
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
- INSTALL(FILES ${CMAKE_BINARY_DIR}/lib/preferences DESTINATION ${LIBDIR})
- endif()
diff --git a/icewm17/patches/patch-src_acpustatus.cc b/icewm17/patches/patch-src_acpustatus.cc
deleted file mode 100644
index 609077a2d3..0000000000
--- a/icewm17/patches/patch-src_acpustatus.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-src_acpustatus.cc,v 1.1 2019/12/10 19:22:36 plunky Exp $
-
-fix CPU Status applet
-
---- src/acpustatus.cc.orig 2017-07-30 08:53:35.524267864 +0000
-+++ src/acpustatus.cc
-@@ -305,20 +305,15 @@ void CPUStatus::updateToolTip() {
- }
- setToolTip(ustring(fmt));
- }
--#elif defined HAVE_GETLOADAVG2
-- char load[sizeof("999.99 999.99 999.99")];
-+#elif defined HAVE_GETLOADAVG
-+ char fmt[255];
- double loadavg[3];
- if (getloadavg(loadavg, 3) < 0)
- return;
-- snprintf(load, sizeof(load), "%3.2g %3.2g %3.2g",
-- loadavg[0], loadavg[1], loadavg[2]);
-- {
-- char id[10];
-- snprintf(id, sizeof[id], " %d ", cpuid);
-- char *loadmsg = cstrJoin(_("CPU"), id ,_("Load: "), load, NULL);
-- setToolTip(ustring(loadmsg));
-- delete [] loadmsg;
-- }
-+ snprintf(fmt, sizeof(fmt), "%s %s %s: %3.2g %3.2g %3.2g",
-+ _("CPU"), cpuid,
-+ _("Load"), loadavg[0], loadavg[1], loadavg[2]);
-+ setToolTip(ustring(fmt));
- #endif
- }
-
-@@ -634,6 +629,7 @@ void CPUStatus::getStatus() {
- #else
- typedef long cp_time_t;
- #endif
-+#ifndef HAVE_SYSCTLBYNAME
- #if defined KERN_CPTIME
- static int mib[] = { CTL_KERN, KERN_CPTIME };
- #elif defined KERN_CP_TIME
-@@ -641,6 +637,7 @@ void CPUStatus::getStatus() {
- #else
- static int mib[] = { 0, 0 };
- #endif
-+#endif
-
- cp_time_t cp_time[CPUSTATES];
- size_t len = sizeof( cp_time );
-@@ -713,7 +710,7 @@ void CPUStatus::GetCPUStatus(YSMListener
- CPUStatus::getCPUStatusCombined(aParent, fCPUStatus);
- }
- #elif defined(HAVE_SYSCTL_CP_TIME)
-- CPUStatus::getCPUStatusCombined(aParent, fCPUStatus);
-+ CPUStatus::getCPUStatusCombined(smActionListener, aParent, fCPUStatus);
- #endif
- }
- void CPUStatus::getCPUStatusCombined(YSMListener *smActionListener, YWindow *aParent, CPUStatus **&fCPUStatus) {
diff --git a/icewm17/patches/patch-src_base.h b/icewm17/patches/patch-src_base.h
deleted file mode 100644
index e3d71bc748..0000000000
--- a/icewm17/patches/patch-src_base.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_base.h,v 1.1 2018/11/01 09:25:29 bsiegert Exp $
-
---- src/base.h.orig 2017-07-30 08:53:35.000000000 +0000
-+++ src/base.h
-@@ -2,6 +2,7 @@
- #define __BASE_H
-
- #include <stddef.h>
-+#include <string.h>
-
- #ifndef __GNUC__
- #define __attribute__(a)
-@@ -43,11 +44,6 @@ inline T abs(T v) {
-
- /*** String Functions *********************************************************/
-
--/* Prefer this as a safer alternative over strcpy. Return strlen(from). */
--size_t strlcpy(char *dest, const char *from, size_t dest_size);
--/* Prefer this over strcat. Return strlen(dest) + strlen(from). */
--size_t strlcat(char *dest, const char *from, size_t dest_size);
--
- char *newstr(char const *str);
- char *newstr(char const *str, int len);
- char *newstr(char const *str, char const *delim);
diff --git a/icewm17/patches/patch-src_icesm.cc b/icewm17/patches/patch-src_icesm.cc
deleted file mode 100644
index 856d7fb698..0000000000
--- a/icewm17/patches/patch-src_icesm.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_icesm.cc,v 1.1 2018/11/01 09:25:29 bsiegert Exp $
-
---- src/icesm.cc.orig 2017-07-30 08:53:35.000000000 +0000
-+++ src/icesm.cc
-@@ -9,6 +9,8 @@
- #include <wordexp.h>
- #endif
-
-+#include <signal.h>
-+
- char const *ApplicationName = ICESMEXE;
-
- class SessionManager: public YApplication {
diff --git a/icewm17/patches/patch-src_icetray.cc b/icewm17/patches/patch-src_icetray.cc
deleted file mode 100644
index 3db2803e76..0000000000
--- a/icewm17/patches/patch-src_icetray.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_icetray.cc,v 1.1 2018/11/01 09:25:29 bsiegert Exp $
-
---- src/icetray.cc.orig 2017-07-30 08:53:35.000000000 +0000
-+++ src/icetray.cc
-@@ -10,6 +10,8 @@
- #include "yprefs.h"
- #include "yconfig.h"
-
-+#include <signal.h>
-+
- char const *ApplicationName = "icewmtray";
-
- #ifdef CONFIG_TASKBAR
diff --git a/icewm17/patches/patch-src_wmapp.cc b/icewm17/patches/patch-src_wmapp.cc
deleted file mode 100644
index 29ba372337..0000000000
--- a/icewm17/patches/patch-src_wmapp.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_wmapp.cc,v 1.1 2018/11/01 09:25:29 bsiegert Exp $
-
---- src/wmapp.cc.orig 2017-07-30 08:53:35.000000000 +0000
-+++ src/wmapp.cc
-@@ -43,6 +43,8 @@
- #include "ypointer.h"
- #include "intl.h"
-
-+#include <signal.h>
-+
- char const *ApplicationName("IceWM");
- int rebootOrShutdown = 0;
- static bool initializing(true);
diff --git a/icewm17/patches/patch-src_wpixres.cc b/icewm17/patches/patch-src_wpixres.cc
deleted file mode 100644
index 81976facfc..0000000000
--- a/icewm17/patches/patch-src_wpixres.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_wpixres.cc,v 1.1 2018/11/01 09:25:29 bsiegert Exp $
-
-Use The BSD Daemon instead of Tux on *BSD.
-
---- src/wpixres.cc.orig 2017-07-30 08:53:35.000000000 +0000
-+++ src/wpixres.cc
-@@ -294,7 +294,11 @@ static const PixmapResource taskbar2PixR
- #endif
-
- PixmapResource(taskbarStartImage, "start.xpm", "icewm.xpm"),
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-+ PixmapResource(taskbarLinuxImage, "bsd-daemon.xpm"),
-+#else
- PixmapResource(taskbarLinuxImage, "linux.xpm"), // deprecated
-+#endif
- PixmapResource(taskbarWindowsImage, "windows.xpm"),
- PixmapResource(taskbarShowDesktopImage, "desktop.xpm"),
- PixmapResource(taskbarCollapseImage, "collapse.xpm"),
diff --git a/icewm17/patches/patch-src_yapp.cc b/icewm17/patches/patch-src_yapp.cc
deleted file mode 100644
index ce8be88caf..0000000000
--- a/icewm17/patches/patch-src_yapp.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_yapp.cc,v 1.1 2018/11/01 09:25:29 bsiegert Exp $
-
---- src/yapp.cc.orig 2017-07-30 08:53:35.000000000 +0000
-+++ src/yapp.cc
-@@ -20,6 +20,8 @@
- #include <sys/signalfd.h>
- #endif
-
-+#include <signal.h>
-+
- // FIXME: get rid of this global
- extern char const *ApplicationName;
- char const *&YApplication::Name = ApplicationName;
diff --git a/icewm17/patches/patch-src_ylocale.cc b/icewm17/patches/patch-src_ylocale.cc
deleted file mode 100644
index e42d9f9bc5..0000000000
--- a/icewm17/patches/patch-src_ylocale.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-src_ylocale.cc,v 1.2 2019/10/25 10:21:32 kamil Exp $
-
---- src/ylocale.cc.orig 2017-07-30 08:53:35.524267864 +0000
-+++ src/ylocale.cc
-@@ -28,6 +28,14 @@
- #include "ylib.h"
- #include "yprefs.h"
-
-+#if defined(__NetBSD__)
-+#include <sys/param.h>
-+#if __NetBSD_Prereq__(9,99,17)
-+#define NETBSD_POSIX_ICONV 1
-+#else
-+#define NETBSD_POSIX_ICONV 0
-+#endif
-+#endif
-
- #ifdef CONFIG_I18N
- YLocale * YLocale::instance(NULL);
-@@ -55,6 +63,8 @@ YLocale::YLocale(char const * localeName
- int const codesetItems[] = {
- #ifdef CONFIG_NL_CODESETS
- CONFIG_NL_CODESETS
-+#elif !defined(__GLIBC__)
-+ CODESET, 0
- #else
- CODESET, _NL_CTYPE_CODESET_NAME, 0
- #endif
-@@ -159,7 +169,11 @@ YUChar *YLocale::unicodeString(const YLC
- char * inbuf((char *) lStr), * outbuf((char *) uStr);
- size_t inlen(lLen), outlen(4 * lLen);
-
-+#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
-+ if (0 > (int) iconv(instance->toUnicode, const_cast<const char **>(&inbuf), &inlen, &outbuf, &outlen))
-+#else
- if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
-+#endif
- warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno));
-
- *((YUChar *) outbuf) = 0;
Home |
Main Index |
Thread Index |
Old Index