public inbox for cygwin-apps-cvs@sourceware.org
help / color / mirror / Atom feed
* [setup - the official Cygwin setup program] branch master, updated. release_2.924
@ 2022-11-25 15:05 Jon TURNEY
0 siblings, 0 replies; only message in thread
From: Jon TURNEY @ 2022-11-25 15:05 UTC (permalink / raw)
To: cygwin-apps-cvs
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 11678 bytes --]
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=0e43a3f82de3dfbd031f52aa7f8621f270c1cdd1
commit 0e43a3f82de3dfbd031f52aa7f8621f270c1cdd1
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Nov 21 14:57:39 2022 +0000
Drop use of std::unary_function
std::unary_function is deprecated in C++11.
visit_if() in Generic.h relies upon the callable providing an
argument_type type (which both predicate and visitor accept), so retain
that in StringConcenator, but we'd probably be better off just
open-coding visit_if(), since it's only used in the one place.
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=b45097bf7b5c2e5f64d295efd4fdff9d178a8381
commit b45097bf7b5c2e5f64d295efd4fdff9d178a8381
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Nov 21 14:53:28 2022 +0000
Replace use of std::bind1st with std::bind
std::bind1st is deprecated in C++11, removed in C++17, and a
deprecated-declaration warning is now emitted by g++.
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=ce10d0bb834af93f8a722e1c8b8f35b76d62e454
commit ce10d0bb834af93f8a722e1c8b8f35b76d62e454
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Nov 21 13:54:26 2022 +0000
Make Windows 6.1 & Windows x86 unsupported
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=4883fdd21d81ac0c89b19c5f5caeb1020ccb8db3
commit 4883fdd21d81ac0c89b19c5f5caeb1020ccb8db3
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun Nov 20 15:51:27 2022 +0000
Stop signing with old, now expired private key
Diff:
---
Generic.h | 1 -
Makefile.am | 2 +-
main.cc | 37 ++++++++++++++++++++++++-------------
package_meta.cc | 13 +++++++++----
po/fr/res.po | 16 ++++++----------
res.pot | 14 ++++++--------
res/en/res.rc | 2 +-
res/fr/res.rc | 2 +-
resource.h | 2 +-
9 files changed, 49 insertions(+), 40 deletions(-)
diff --git a/Generic.h b/Generic.h
index 7406b7fe..44c66979 100644
--- a/Generic.h
+++ b/Generic.h
@@ -16,7 +16,6 @@
#ifndef SETUP_GENERIC_H
#define SETUP_GENERIC_H
-/* Todo fully paramterise */
template <class _Visitor, class _Predicate>
struct _visit_if {
_visit_if(_Visitor v, _Predicate p) : visitor(v), predicate (p) {}
diff --git a/Makefile.am b/Makefile.am
index d8300e8d..ebb38226 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -332,7 +332,7 @@ release: upx
UPLOAD_HOST=cygwin-admin@cygwin.com
UPLOAD_PATH=/www/sourceware/htdocs/cygwin/setup
-SIGN_KEYS="--enable-dsa2 --personal-digest-preferences=sha256 -u 676041BA -u 1A698DE9E2E56300"
+SIGN_KEYS="--enable-dsa2 --personal-digest-preferences=sha256 -u 1A698DE9E2E56300"
upload: release
scp setup-${VER}.$(ARCH).exe setup-${VER}.$(ARCH).dbg ${UPLOAD_HOST}:${UPLOAD_PATH}
diff --git a/main.cc b/main.cc
index cd25cb28..13d3f8eb 100644
--- a/main.cc
+++ b/main.cc
@@ -334,16 +334,8 @@ WinMain (HINSTANCE h,
goto finish_up;
}
- /* Check if Cygwin works on this Windows version */
- if (!UnsupportedOption && (OSMajorVersion () < 6))
- {
- mbox (NULL, IDS_UNSUPPORTED_WINDOWS_VERSION,
- MB_ICONEXCLAMATION | MB_OK);
- Logger ().exit (1, false);
- }
-
- /* Warn if Windows version is deprecated for Cygwin */
- if (!DeprecatedOption && !elevate)
+ /* Check if Cygwin works on this Windows architecture/version */
+ if (!UnsupportedOption)
{
if
#ifdef _X86_
@@ -351,12 +343,31 @@ WinMain (HINSTANCE h,
#else
(!is_64bit)
#endif
- mbox (NULL, IDS_DEPRECATED_WINDOWS_ARCH,
- MB_ICONEXCLAMATION | MB_OK | MB_DSA_CHECKBOX);
- else if ((OSMajorVersion () == 6) && (OSMinorVersion() < 1))
+ {
+ mbox (NULL, IDS_UNSUPPORTED_WINDOWS_ARCH,
+ MB_ICONEXCLAMATION | MB_OK);
+ Logger ().exit (1, false);
+ }
+ else if ((OSMajorVersion () < 6) ||
+ ((OSMajorVersion () == 6) && (OSMinorVersion() < 1)))
+ {
+ mbox (NULL, IDS_UNSUPPORTED_WINDOWS_VERSION,
+ MB_ICONEXCLAMATION | MB_OK);
+ Logger ().exit (1, false);
+ }
+ }
+
+ /* Plans are to deprecate Windows 7 & 8 sometime during the Cygwin DLL 3.4
+ lifetime */
+#if 0
+ /* Warn if Windows version is deprecated for Cygwin */
+ if (!DeprecatedOption && !elevate)
+ {
+ else if ((OSMajorVersion () == 6) && (OSMinorVersion() < 3))
mbox (NULL, IDS_DEPRECATED_WINDOWS_VERSION,
MB_ICONEXCLAMATION | MB_OK | MB_DSA_CHECKBOX);
}
+#endif
/* Set default DACL and Group. */
nt_sec.setDefaultSecurity ((root_scope == IDC_ROOT_SYSTEM));
diff --git a/package_meta.cc b/package_meta.cc
index ae19917c..2257b59e 100644
--- a/package_meta.cc
+++ b/package_meta.cc
@@ -38,6 +38,8 @@
#include "package_db.h"
#include <algorithm>
+#include <functional>
+
#include "Generic.h"
#include "download.h"
#include "Exception.h"
@@ -81,7 +83,7 @@ packagemeta::packagemeta (packagemeta const &rhs) :
}
-template<class T> struct removeCategory : public std::unary_function<T, void>
+template<class T> struct removeCategory
{
removeCategory(packagemeta *pkg) : _pkg (pkg) {}
void operator() (T x)
@@ -267,7 +269,7 @@ packagemeta::add_category (const std::string& cat)
categories.insert (cat);
}
-struct StringConcatenator : public std::unary_function<const std::string, void>{
+struct StringConcatenator {
StringConcatenator(std::string aString) : gap(aString){}
void operator()(const std::string& aString)
{
@@ -277,6 +279,8 @@ struct StringConcatenator : public std::unary_function<const std::string, void>{
}
std::string result;
std::string gap;
+
+ typedef const std::string argument_type;
};
const std::string
@@ -284,8 +288,9 @@ packagemeta::getReadableCategoryList () const
{
return for_each(categories.begin(), categories.end(),
visit_if (
- StringConcatenator(", "), bind1st(std::not_equal_to<std::string>(), "All"))
- ).visitor.result;
+ StringConcatenator(", "),
+ std::bind(std::not_equal_to<std::string>(), "All", std::placeholders::_1))
+ ).visitor.result;
}
static void
diff --git a/po/fr/res.po b/po/fr/res.po
index 8c143f7e..fe2cc6da 100644
--- a/po/fr/res.po
+++ b/po/fr/res.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-08-22 15:26+0100\n"
+"POT-Creation-Date: 2022-11-21 14:00+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -11,7 +11,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Accelerator-Marker: &\n"
-"X-Generator: Translate Toolkit 3.7.0\n"
+"X-Generator: Translate Toolkit 3.7.3\n"
"X-Merge-On: location\n"
#: DIALOG.IDD_SOURCE.CAPTION
@@ -1150,6 +1150,10 @@ msgstr ""
msgid "Cygwin is not supported on this Windows version"
msgstr "Cygwin n'est pas supporté pour cette version de Windows"
+#: STRINGTABLE.IDS_UNSUPPORTED_WINDOWS_ARCH
+msgid "Cygwin is not supported on 32-bit Windows"
+msgstr ""
+
#: STRINGTABLE.IDS_DEPRECATED_WINDOWS_VERSION
msgid ""
"Cygwin support for this Windows version is deprecated, and will be removed "
@@ -1158,14 +1162,6 @@ msgstr ""
"Cygwin n'est plus supporté pour cette version de Windows, et sera enlevé "
"dans la prochaine version majeure"
-#: STRINGTABLE.IDS_DEPRECATED_WINDOWS_ARCH
-msgid ""
-"Cygwin support for 32-bit Windows is deprecated, and will be removed in the "
-"next major version"
-msgstr ""
-"Cygwin n'est plus supporté pour Windows 32-bits, et sera enlevé dans la "
-"prochaine version majeure"
-
#: STRINGTABLE.IDS_MOUNT_REGISTRY_KEY_FAILED
msgid "Couldn't create registry key to store installation path"
msgstr ""
diff --git a/res.pot b/res.pot
index 64079c8c..b4c7c99c 100644
--- a/res.pot
+++ b/res.pot
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-08-27 12:54+0100\n"
+"POT-Creation-Date: 2022-11-21 13:56+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -11,7 +11,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Accelerator-Marker: &\n"
-"X-Generator: Translate Toolkit 3.7.0\n"
+"X-Generator: Translate Toolkit 3.7.3\n"
"X-Merge-On: location\n"
#: DIALOG.IDD_SOURCE.CAPTION
@@ -1026,18 +1026,16 @@ msgstr ""
msgid "Cygwin is not supported on this Windows version"
msgstr ""
+#: STRINGTABLE.IDS_UNSUPPORTED_WINDOWS_ARCH
+msgid "Cygwin is not supported on 32-bit Windows"
+msgstr ""
+
#: STRINGTABLE.IDS_DEPRECATED_WINDOWS_VERSION
msgid ""
"Cygwin support for this Windows version is deprecated, and will be removed "
"in the next major version"
msgstr ""
-#: STRINGTABLE.IDS_DEPRECATED_WINDOWS_ARCH
-msgid ""
-"Cygwin support for 32-bit Windows is deprecated, and will be removed in the "
-"next major version"
-msgstr ""
-
#: STRINGTABLE.IDS_MOUNT_REGISTRY_KEY_FAILED
msgid "Couldn't create registry key to store installation path"
msgstr ""
diff --git a/res/en/res.rc b/res/en/res.rc
index ef5e8b19..a5341e2a 100644
--- a/res/en/res.rc
+++ b/res/en/res.rc
@@ -613,8 +613,8 @@ BEGIN
"Setup will not be able to create Cygwin Icons "
"in the Start Menu or on the Desktop."
IDS_UNSUPPORTED_WINDOWS_VERSION "Cygwin is not supported on this Windows version"
+ IDS_UNSUPPORTED_WINDOWS_ARCH "Cygwin is not supported on 32-bit Windows"
IDS_DEPRECATED_WINDOWS_VERSION "Cygwin support for this Windows version is deprecated, and will be removed in the next major version"
- IDS_DEPRECATED_WINDOWS_ARCH "Cygwin support for 32-bit Windows is deprecated, and will be removed in the next major version"
IDS_MOUNT_REGISTRY_KEY_FAILED "Couldn't create registry key to store installation path"
IDS_NIO_ERROR "Internet Error: %s"
IDS_PREREQ_UNSOLVED_PROBLEMS
diff --git a/res/fr/res.rc b/res/fr/res.rc
index 747e1dd9..b990f363 100644
--- a/res/fr/res.rc
+++ b/res/fr/res.rc
@@ -593,8 +593,8 @@ BEGIN
"L'assistant ne sera pas capable de créer les icônes "
"Cygwin dans le menu Démarrer ou sur le bureau."
IDS_UNSUPPORTED_WINDOWS_VERSION "Cygwin n'est pas supporté pour cette version de Windows"
+ // IDS_UNSUPPORTED_WINDOWS_ARCH "XXX: Missing translation"
IDS_DEPRECATED_WINDOWS_VERSION "Cygwin n'est plus supporté pour cette version de Windows, et sera enlevé dans la prochaine version majeure"
- IDS_DEPRECATED_WINDOWS_ARCH "Cygwin n'est plus supporté pour Windows 32-bits, et sera enlevé dans la prochaine version majeure"
IDS_MOUNT_REGISTRY_KEY_FAILED "Impossible de créer la clé de registre pour enregistrer le chemin d'installation"
IDS_NIO_ERROR "Erreur Internet : %s"
IDS_PREREQ_UNSOLVED_PROBLEMS
diff --git a/resource.h b/resource.h
index cfe860b6..a09fe65d 100644
--- a/resource.h
+++ b/resource.h
@@ -104,9 +104,9 @@
#define IDS_FILE_INUSE_KILL 1207
#define IDS_FILE_INUSE_MSG 1208
#define IDS_DEPRECATED_WINDOWS_VERSION 1209
-#define IDS_DEPRECATED_WINDOWS_ARCH 1210
#define IDS_VIEW_REMOVABLE 1211
#define IDS_VIEW_UNNEEDED 1212
+#define IDS_UNSUPPORTED_WINDOWS_ARCH 1213
#define IDS_HELPTEXT_COMPACTOS 1500
#define IDS_HELPTEXT_PUBKEY 1501
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-11-25 15:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-25 15:05 [setup - the official Cygwin setup program] branch master, updated. release_2.924 Jon TURNEY
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).