From eb0352e5b075385baebd907081682f14703ef5e0 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 9 Apr 2020 20:48:09 -0700 Subject: Add missing services/linux.scm to gnu/local.mk. * gnu/local.mk (GNU_SYSTEM_MODULES): Add linux.scm. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index eefcdf501a..f401ef173b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -569,6 +569,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/getmail.scm \ %D%/services/guix.scm \ %D%/services/kerberos.scm \ + %D%/services/linux.scm \ %D%/services/lirc.scm \ %D%/services/virtualization.scm \ %D%/services/mail.scm \ -- cgit v1.2.3 From 18ffd2f9687a7c8af0041c129c47db31b7e810c3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 10 Apr 2020 14:48:02 +0200 Subject: gnu: binutils: Shorten file names of MinGW patches. This ensures we stay below the POSIX tar file name length limit. * gnu/packages/patches/binutils-mingw-w64-reproducible-import-libraries.patch: Rename to... * gnu/packages/patches/binutils-mingw-w64-deterministic.patch: ... this. * gnu/packages/patches/binutils-mingw-w64-specify-timestamp.patch: Rename to... * gnu/packages/patches/binutils-mingw-w64-timestamp.patch: ... this. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/cross-base.scm (cross-binutils): Likewise. --- gnu/local.mk | 4 +- gnu/packages/cross-base.scm | 5 +- .../patches/binutils-mingw-w64-deterministic.patch | 22 ++++ ...s-mingw-w64-reproducible-import-libraries.patch | 22 ---- .../binutils-mingw-w64-specify-timestamp.patch | 137 --------------------- .../patches/binutils-mingw-w64-timestamp.patch | 137 +++++++++++++++++++++ 6 files changed, 163 insertions(+), 164 deletions(-) create mode 100644 gnu/packages/patches/binutils-mingw-w64-deterministic.patch delete mode 100644 gnu/packages/patches/binutils-mingw-w64-reproducible-import-libraries.patch delete mode 100644 gnu/packages/patches/binutils-mingw-w64-specify-timestamp.patch create mode 100644 gnu/packages/patches/binutils-mingw-w64-timestamp.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index f401ef173b..a9dda84a81 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -776,8 +776,8 @@ dist_patch_DATA = \ %D%/packages/patches/bidiv-update-fribidi.patch \ %D%/packages/patches/binutils-boot-2.20.1a.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ - %D%/packages/patches/binutils-mingw-w64-specify-timestamp.patch \ - %D%/packages/patches/binutils-mingw-w64-reproducible-import-libraries.patch \ + %D%/packages/patches/binutils-mingw-w64-timestamp.patch \ + %D%/packages/patches/binutils-mingw-w64-deterministic.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ %D%/packages/patches/bluez-CVE-2020-0556.patch \ diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index b0eb7ab4ed..b07014da6c 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -98,9 +98,8 @@ ((target-mingw? target) (package-with-extra-patches binutils - (search-patches - "binutils-mingw-w64-specify-timestamp.patch" - "binutils-mingw-w64-reproducible-import-libraries.patch"))) + (search-patches "binutils-mingw-w64-timestamp.patch" + "binutils-mingw-w64-deterministic.patch"))) (else binutils)) target))) diff --git a/gnu/packages/patches/binutils-mingw-w64-deterministic.patch b/gnu/packages/patches/binutils-mingw-w64-deterministic.patch new file mode 100644 index 0000000000..3e48b87935 --- /dev/null +++ b/gnu/packages/patches/binutils-mingw-w64-deterministic.patch @@ -0,0 +1,22 @@ +This following patch was originally found at the debian mingw-w64 team's +binutils repo located here: +https://salsa.debian.org/mingw-w64-team/binutils-mingw-w64.git + +Invoke the following in the aforementioned repo to see the original patch: + + $ git show da63f6b:debian/patches/reproducible-import-libraries.patch + +Description: Make DLL import libraries reproducible +Author: Benjamin Moody +Bug-Debian: https://bugs.debian.org/915055 + +--- a/ld/pe-dll.c ++++ b/ld/pe-dll.c +@@ -2844,6 +2844,7 @@ + + bfd_set_format (outarch, bfd_archive); + outarch->has_armap = 1; ++ outarch->flags |= BFD_DETERMINISTIC_OUTPUT; + + /* Work out a reasonable size of things to put onto one line. */ + ar_head = make_head (outarch); diff --git a/gnu/packages/patches/binutils-mingw-w64-reproducible-import-libraries.patch b/gnu/packages/patches/binutils-mingw-w64-reproducible-import-libraries.patch deleted file mode 100644 index 3e48b87935..0000000000 --- a/gnu/packages/patches/binutils-mingw-w64-reproducible-import-libraries.patch +++ /dev/null @@ -1,22 +0,0 @@ -This following patch was originally found at the debian mingw-w64 team's -binutils repo located here: -https://salsa.debian.org/mingw-w64-team/binutils-mingw-w64.git - -Invoke the following in the aforementioned repo to see the original patch: - - $ git show da63f6b:debian/patches/reproducible-import-libraries.patch - -Description: Make DLL import libraries reproducible -Author: Benjamin Moody -Bug-Debian: https://bugs.debian.org/915055 - ---- a/ld/pe-dll.c -+++ b/ld/pe-dll.c -@@ -2844,6 +2844,7 @@ - - bfd_set_format (outarch, bfd_archive); - outarch->has_armap = 1; -+ outarch->flags |= BFD_DETERMINISTIC_OUTPUT; - - /* Work out a reasonable size of things to put onto one line. */ - ar_head = make_head (outarch); diff --git a/gnu/packages/patches/binutils-mingw-w64-specify-timestamp.patch b/gnu/packages/patches/binutils-mingw-w64-specify-timestamp.patch deleted file mode 100644 index b785043b62..0000000000 --- a/gnu/packages/patches/binutils-mingw-w64-specify-timestamp.patch +++ /dev/null @@ -1,137 +0,0 @@ -This following patch was originally found at the debian mingw-w64 team's -binutils repo located here: -https://salsa.debian.org/mingw-w64-team/binutils-mingw-w64.git - -Invoke the following in the aforementioned repo to see the original patch: - - $ git show da63f6b:debian/patches/specify-timestamp.patch - -Description: Allow the PE timestamp to be specified -Author: Stephen Kitt - ---- a/bfd/peXXigen.c -+++ b/bfd/peXXigen.c -@@ -70,6 +70,9 @@ - #include - #endif - -+#include -+#include -+ - /* NOTE: it's strange to be including an architecture specific header - in what's supposed to be general (to PE/PEI) code. However, that's - where the definitions are, and they don't vary per architecture -@@ -879,10 +882,38 @@ - - /* Use a real timestamp by default, unless the no-insert-timestamp - option was chosen. */ -- if ((pe_data (abfd)->insert_timestamp)) -- H_PUT_32 (abfd, time (0), filehdr_out->f_timdat); -- else -+ if (pe_data (abfd)->insert_timestamp) { -+ time_t now; -+ char *source_date_epoch; -+ unsigned long long epoch; -+ char *endptr; -+ -+ now = time(NULL); -+ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); -+ if (source_date_epoch) { -+ errno = 0; -+ epoch = strtoull(source_date_epoch, &endptr, 10); -+ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) -+ || (errno != 0 && epoch == 0)) { -+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", -+ strerror(errno)); -+ } else if (endptr == source_date_epoch) { -+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", -+ endptr); -+ } else if (*endptr != '\0') { -+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", -+ endptr); -+ } else if (epoch > ULONG_MAX) { -+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n", -+ ULONG_MAX, epoch); -+ } else { -+ now = epoch; -+ } -+ } -+ H_PUT_32 (abfd, now, filehdr_out->f_timdat); -+ } else { - H_PUT_32 (abfd, 0, filehdr_out->f_timdat); -+ } - - PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, - filehdr_out->f_symptr); ---- a/ld/pe-dll.c -+++ b/ld/pe-dll.c -@@ -26,6 +26,8 @@ - #include "filenames.h" - #include "safe-ctype.h" - -+#include -+#include - #include - - #include "ld.h" -@@ -1202,8 +1204,36 @@ - - memset (edata_d, 0, edata_sz); - -- if (pe_data (abfd)->insert_timestamp) -- H_PUT_32 (abfd, time (0), edata_d + 4); -+ if (pe_data (abfd)->insert_timestamp) { -+ time_t now; -+ char *source_date_epoch; -+ unsigned long long epoch; -+ char *endptr; -+ -+ now = time(NULL); -+ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); -+ if (source_date_epoch) { -+ errno = 0; -+ epoch = strtoull(source_date_epoch, &endptr, 10); -+ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) -+ || (errno != 0 && epoch == 0)) { -+ einfo("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", -+ strerror(errno)); -+ } else if (endptr == source_date_epoch) { -+ einfo("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", -+ endptr); -+ } else if (*endptr != '\0') { -+ einfo("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", -+ endptr); -+ } else if (epoch > ULONG_MAX) { -+ einfo("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n", -+ ULONG_MAX, epoch); -+ } else { -+ now = epoch; -+ } -+ } -+ H_PUT_32 (abfd, now, edata_d + 4); -+ } - - if (pe_def_file->version_major != -1) - { ---- a/ld/emultempl/pe.em -+++ b/ld/emultempl/pe.em -@@ -303,7 +303,7 @@ - OPTION_USE_NUL_PREFIXED_IMPORT_TABLES}, - {"no-leading-underscore", no_argument, NULL, OPTION_NO_LEADING_UNDERSCORE}, - {"leading-underscore", no_argument, NULL, OPTION_LEADING_UNDERSCORE}, -- {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP}, -+ {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, - {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, - #ifdef DLL_SUPPORT - /* getopt allows abbreviations, so we do this to stop it ---- a/ld/emultempl/pep.em -+++ b/ld/emultempl/pep.em -@@ -321,7 +321,7 @@ - {"no-bind", no_argument, NULL, OPTION_NO_BIND}, - {"wdmdriver", no_argument, NULL, OPTION_WDM_DRIVER}, - {"tsaware", no_argument, NULL, OPTION_TERMINAL_SERVER_AWARE}, -- {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP}, -+ {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, - {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, - {"build-id", optional_argument, NULL, OPTION_BUILD_ID}, - {NULL, no_argument, NULL, 0} diff --git a/gnu/packages/patches/binutils-mingw-w64-timestamp.patch b/gnu/packages/patches/binutils-mingw-w64-timestamp.patch new file mode 100644 index 0000000000..b785043b62 --- /dev/null +++ b/gnu/packages/patches/binutils-mingw-w64-timestamp.patch @@ -0,0 +1,137 @@ +This following patch was originally found at the debian mingw-w64 team's +binutils repo located here: +https://salsa.debian.org/mingw-w64-team/binutils-mingw-w64.git + +Invoke the following in the aforementioned repo to see the original patch: + + $ git show da63f6b:debian/patches/specify-timestamp.patch + +Description: Allow the PE timestamp to be specified +Author: Stephen Kitt + +--- a/bfd/peXXigen.c ++++ b/bfd/peXXigen.c +@@ -70,6 +70,9 @@ + #include + #endif + ++#include ++#include ++ + /* NOTE: it's strange to be including an architecture specific header + in what's supposed to be general (to PE/PEI) code. However, that's + where the definitions are, and they don't vary per architecture +@@ -879,10 +882,38 @@ + + /* Use a real timestamp by default, unless the no-insert-timestamp + option was chosen. */ +- if ((pe_data (abfd)->insert_timestamp)) +- H_PUT_32 (abfd, time (0), filehdr_out->f_timdat); +- else ++ if (pe_data (abfd)->insert_timestamp) { ++ time_t now; ++ char *source_date_epoch; ++ unsigned long long epoch; ++ char *endptr; ++ ++ now = time(NULL); ++ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); ++ if (source_date_epoch) { ++ errno = 0; ++ epoch = strtoull(source_date_epoch, &endptr, 10); ++ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) ++ || (errno != 0 && epoch == 0)) { ++ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", ++ strerror(errno)); ++ } else if (endptr == source_date_epoch) { ++ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", ++ endptr); ++ } else if (*endptr != '\0') { ++ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", ++ endptr); ++ } else if (epoch > ULONG_MAX) { ++ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n", ++ ULONG_MAX, epoch); ++ } else { ++ now = epoch; ++ } ++ } ++ H_PUT_32 (abfd, now, filehdr_out->f_timdat); ++ } else { + H_PUT_32 (abfd, 0, filehdr_out->f_timdat); ++ } + + PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, + filehdr_out->f_symptr); +--- a/ld/pe-dll.c ++++ b/ld/pe-dll.c +@@ -26,6 +26,8 @@ + #include "filenames.h" + #include "safe-ctype.h" + ++#include ++#include + #include + + #include "ld.h" +@@ -1202,8 +1204,36 @@ + + memset (edata_d, 0, edata_sz); + +- if (pe_data (abfd)->insert_timestamp) +- H_PUT_32 (abfd, time (0), edata_d + 4); ++ if (pe_data (abfd)->insert_timestamp) { ++ time_t now; ++ char *source_date_epoch; ++ unsigned long long epoch; ++ char *endptr; ++ ++ now = time(NULL); ++ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); ++ if (source_date_epoch) { ++ errno = 0; ++ epoch = strtoull(source_date_epoch, &endptr, 10); ++ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) ++ || (errno != 0 && epoch == 0)) { ++ einfo("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", ++ strerror(errno)); ++ } else if (endptr == source_date_epoch) { ++ einfo("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", ++ endptr); ++ } else if (*endptr != '\0') { ++ einfo("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", ++ endptr); ++ } else if (epoch > ULONG_MAX) { ++ einfo("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n", ++ ULONG_MAX, epoch); ++ } else { ++ now = epoch; ++ } ++ } ++ H_PUT_32 (abfd, now, edata_d + 4); ++ } + + if (pe_def_file->version_major != -1) + { +--- a/ld/emultempl/pe.em ++++ b/ld/emultempl/pe.em +@@ -303,7 +303,7 @@ + OPTION_USE_NUL_PREFIXED_IMPORT_TABLES}, + {"no-leading-underscore", no_argument, NULL, OPTION_NO_LEADING_UNDERSCORE}, + {"leading-underscore", no_argument, NULL, OPTION_LEADING_UNDERSCORE}, +- {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP}, ++ {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, + {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, + #ifdef DLL_SUPPORT + /* getopt allows abbreviations, so we do this to stop it +--- a/ld/emultempl/pep.em ++++ b/ld/emultempl/pep.em +@@ -321,7 +321,7 @@ + {"no-bind", no_argument, NULL, OPTION_NO_BIND}, + {"wdmdriver", no_argument, NULL, OPTION_WDM_DRIVER}, + {"tsaware", no_argument, NULL, OPTION_TERMINAL_SERVER_AWARE}, +- {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP}, ++ {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, + {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, + {"build-id", optional_argument, NULL, OPTION_BUILD_ID}, + {NULL, no_argument, NULL, 0} -- cgit v1.2.3 From 17edf577d5d377923d8f32c563092d80a48e9515 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 10 Apr 2020 14:55:31 +0200 Subject: gnu: akonadi: Shorten file name of patch. This ensures we stay below the POSIX tar file name length limit. * gnu/packages/patches/akonadi-Revert-Make-installation-properly-relo.patch: Rename to... * gnu/packages/patches/akonadi-not-relocatable.patch: ... this. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/kde-pim.scm (akonadi): Likewise. --- gnu/local.mk | 2 +- gnu/packages/kde-pim.scm | 2 +- ...di-Revert-Make-installation-properly-relo.patch | 49 ---------------------- gnu/packages/patches/akonadi-not-relocatable.patch | 49 ++++++++++++++++++++++ 4 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 gnu/packages/patches/akonadi-Revert-Make-installation-properly-relo.patch create mode 100644 gnu/packages/patches/akonadi-not-relocatable.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index a9dda84a81..ba9bd98fb9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -726,7 +726,7 @@ dist_patch_DATA = \ %D%/packages/patches/aegisub-boost68.patch \ %D%/packages/patches/agg-am_c_prototype.patch \ %D%/packages/patches/akonadi-paths.patch \ - %D%/packages/patches/akonadi-Revert-Make-installation-properly-relo.patch \ + %D%/packages/patches/akonadi-not-relocatable.patch \ %D%/packages/patches/akonadi-timestamps.patch \ %D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \ %D%/packages/patches/amule-crypto-6.patch \ diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 1b99ae1de4..fea6dd3068 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -53,7 +53,7 @@ (patches (search-patches "akonadi-paths.patch" "akonadi-timestamps.patch" - "akonadi-Revert-Make-installation-properly-relo.patch")))) + "akonadi-not-relocatable.patch")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) diff --git a/gnu/packages/patches/akonadi-Revert-Make-installation-properly-relo.patch b/gnu/packages/patches/akonadi-Revert-Make-installation-properly-relo.patch deleted file mode 100644 index c3964c5c05..0000000000 --- a/gnu/packages/patches/akonadi-Revert-Make-installation-properly-relo.patch +++ /dev/null @@ -1,49 +0,0 @@ -From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001 -From: gnidorah -Date: Fri, 22 Dec 2017 17:36:03 +0300 -Subject: [PATCH] Revert "Make Akonadi installation properly relocatable" - -This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a. ---- - CMakeLists.txt | 3 --- - KF5AkonadiConfig.cmake.in | 6 +++--- - 2 files changed, 3 insertions(+), 6 deletions(-) - -Index: akonadi-19.08.0/CMakeLists.txt -=================================================================== ---- akonadi-19.08.0.orig/CMakeLists.txt -+++ akonadi-19.08.0/CMakeLists.txt -@@ -306,9 +306,6 @@ configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} -- PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR -- AKONADI_INCLUDE_DIR -- KF5Akonadi_DATA_DIR - ) - - install(FILES -Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in -=================================================================== ---- akonadi-19.08.0.orig/KF5AkonadiConfig.cmake.in -+++ akonadi-19.08.0/KF5AkonadiConfig.cmake.in -@@ -26,8 +26,8 @@ if(BUILD_TESTING) - find_dependency(Qt5Test "@QT_REQUIRED_VERSION@") - endif() - --set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@") --set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@") -+set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@") -+set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@") - - find_dependency(Boost "@Boost_MINIMUM_VERSION@") - -@@ -35,7 +35,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5Ako - include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake) - - # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed --set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@") -+set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@") - - #################################################################################### - # CMAKE_AUTOMOC diff --git a/gnu/packages/patches/akonadi-not-relocatable.patch b/gnu/packages/patches/akonadi-not-relocatable.patch new file mode 100644 index 0000000000..c3964c5c05 --- /dev/null +++ b/gnu/packages/patches/akonadi-not-relocatable.patch @@ -0,0 +1,49 @@ +From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001 +From: gnidorah +Date: Fri, 22 Dec 2017 17:36:03 +0300 +Subject: [PATCH] Revert "Make Akonadi installation properly relocatable" + +This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a. +--- + CMakeLists.txt | 3 --- + KF5AkonadiConfig.cmake.in | 6 +++--- + 2 files changed, 3 insertions(+), 6 deletions(-) + +Index: akonadi-19.08.0/CMakeLists.txt +=================================================================== +--- akonadi-19.08.0.orig/CMakeLists.txt ++++ akonadi-19.08.0/CMakeLists.txt +@@ -306,9 +306,6 @@ configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} +- PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR +- AKONADI_INCLUDE_DIR +- KF5Akonadi_DATA_DIR + ) + + install(FILES +Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in +=================================================================== +--- akonadi-19.08.0.orig/KF5AkonadiConfig.cmake.in ++++ akonadi-19.08.0/KF5AkonadiConfig.cmake.in +@@ -26,8 +26,8 @@ if(BUILD_TESTING) + find_dependency(Qt5Test "@QT_REQUIRED_VERSION@") + endif() + +-set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@") +-set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@") ++set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@") ++set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@") + + find_dependency(Boost "@Boost_MINIMUM_VERSION@") + +@@ -35,7 +35,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5Ako + include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake) + + # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed +-set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@") ++set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@") + + #################################################################################### + # CMAKE_AUTOMOC -- cgit v1.2.3 From abc33218f167de366712feafde94441cf2216d0b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 10 Apr 2020 15:54:10 +0200 Subject: gnu: sdl-pango: Shorten file name of patch. * gnu/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch: Rename to... * gnu/packages/patches/sdl-pango-header-guard.patch: ... this. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/sdl.scm (sdl-pango): Likewise. --- gnu/local.mk | 2 +- ...-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch | 20 -------------------- gnu/packages/patches/sdl-pango-header-guard.patch | 20 ++++++++++++++++++++ gnu/packages/sdl.scm | 14 ++++++-------- 4 files changed, 27 insertions(+), 29 deletions(-) delete mode 100644 gnu/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch create mode 100644 gnu/packages/patches/sdl-pango-header-guard.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index ba9bd98fb9..73f9d5d69c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1288,7 +1288,7 @@ dist_patch_DATA = \ %D%/packages/patches/sdl-pango-api_additions.patch \ %D%/packages/patches/sdl-pango-blit_overflow.patch \ %D%/packages/patches/sdl-pango-fillrect_crash.patch \ - %D%/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch \ + %D%/packages/patches/sdl-pango-header-guard.patch \ %D%/packages/patches/sdl-pango-matrix_declarations.patch \ %D%/packages/patches/sdl-pango-sans-serif.patch \ %D%/packages/patches/patchutils-test-perms.patch \ diff --git a/gnu/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch b/gnu/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch deleted file mode 100644 index 3d4b10cc10..0000000000 --- a/gnu/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/SDL_Pango.h -+++ b/src/SDL_Pango.h -@@ -171,7 +171,7 @@ - SDLPango_Direction direction); - - --#ifdef __FT2_BUILD_UNIX_H__ -+#ifdef FT2BUILD_H_ - - extern DECLSPEC void SDLCALL SDLPango_CopyFTBitmapToSurface( - const FT_Bitmap *bitmap, -@@ -179,7 +179,7 @@ - const SDLPango_Matrix *matrix, - SDL_Rect *rect); - --#endif /* __FT2_BUILD_UNIX_H__ */ -+#endif - - - #ifdef __PANGO_H__ diff --git a/gnu/packages/patches/sdl-pango-header-guard.patch b/gnu/packages/patches/sdl-pango-header-guard.patch new file mode 100644 index 0000000000..3d4b10cc10 --- /dev/null +++ b/gnu/packages/patches/sdl-pango-header-guard.patch @@ -0,0 +1,20 @@ +--- a/src/SDL_Pango.h ++++ b/src/SDL_Pango.h +@@ -171,7 +171,7 @@ + SDLPango_Direction direction); + + +-#ifdef __FT2_BUILD_UNIX_H__ ++#ifdef FT2BUILD_H_ + + extern DECLSPEC void SDLCALL SDLPango_CopyFTBitmapToSurface( + const FT_Bitmap *bitmap, +@@ -179,7 +179,7 @@ + const SDLPango_Matrix *matrix, + SDL_Rect *rect); + +-#endif /* __FT2_BUILD_UNIX_H__ */ ++#endif + + + #ifdef __PANGO_H__ diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 7b36d5509c..105296cd0f 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -345,14 +345,12 @@ SDL.") "SDL_Pango-" version ".tar.gz")) (sha256 (base32 "197baw1dsg0p4pljs5k0fshbyki00r4l49m1drlpqw6ggawx6xbz")) - (patches - (search-patches - "sdl-pango-api_additions.patch" - "sdl-pango-blit_overflow.patch" - "sdl-pango-fillrect_crash.patch" - "sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch" - "sdl-pango-matrix_declarations.patch" - "sdl-pango-sans-serif.patch")))) + (patches (search-patches "sdl-pango-api_additions.patch" + "sdl-pango-blit_overflow.patch" + "sdl-pango-fillrect_crash.patch" + "sdl-pango-header-guard.patch" + "sdl-pango-matrix_declarations.patch" + "sdl-pango-sans-serif.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--disable-static") -- cgit v1.2.3 From f4ec5e1a9823a66c27fe2bc033db7b58b29edfef Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 11 Apr 2020 23:58:49 +0200 Subject: gnu: gdm: Don't offer GNOME when it's not in the system profile. Fixes . Reported by Pierre Neidhardt . * gnu/packages/patches/gdm-default-session.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gnome.scm (gdm)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 3 +- gnu/packages/patches/gdm-default-session.patch | 91 ++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gdm-default-session.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 73f9d5d69c..0117a43ae2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -932,6 +932,7 @@ dist_patch_DATA = \ %D%/packages/patches/gd-CVE-2019-6978.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-freetype-test-failure.patch \ + %D%/packages/patches/gdm-default-session.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-diff-swap-cover-args.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 088de7dd4c..63dd8dc4c6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6776,7 +6776,8 @@ libxml2.") name "-" version ".tar.xz")) (sha256 (base32 - "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4")))) + "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4")) + (patches (search-patches "gdm-default-session.patch")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags diff --git a/gnu/packages/patches/gdm-default-session.patch b/gnu/packages/patches/gdm-default-session.patch new file mode 100644 index 0000000000..4839a04de4 --- /dev/null +++ b/gnu/packages/patches/gdm-default-session.patch @@ -0,0 +1,91 @@ +This patch ensures '.desktop' files are picked up in the system profile +and not in the directories listed in $XDG_DATA_DIRS. The latter includes +'gnome-session.desktop', which should be used if it's in +/run/current-system/profile, and only then. + +Fixes . + +diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c +index 6a116a8..02c1458 100644 +--- a/daemon/gdm-session.c ++++ b/daemon/gdm-session.c +@@ -348,24 +348,18 @@ get_system_session_dirs (GdmSession *self) + GArray *search_array = NULL; + char **search_dirs; + int i; +- const gchar * const *system_data_dirs = g_get_system_data_dirs (); + + static const char *x_search_dirs[] = { + "/etc/X11/sessions/", + DMCONFDIR "/Sessions/", + DATADIR "/gdm/BuiltInSessions/", +- DATADIR "/xsessions/", ++ "/run/current-system/profile/share/xsessions/" + }; + + static const char *wayland_search_dir = DATADIR "/wayland-sessions/"; + + search_array = g_array_new (TRUE, TRUE, sizeof (char *)); + +- for (i = 0; system_data_dirs[i]; i++) { +- gchar *dir = g_build_filename (system_data_dirs[i], "xsessions", NULL); +- g_array_append_val (search_array, dir); +- } +- + g_array_append_vals (search_array, x_search_dirs, G_N_ELEMENTS (x_search_dirs)); + + #ifdef ENABLE_WAYLAND_SUPPORT +@@ -373,16 +367,7 @@ get_system_session_dirs (GdmSession *self) + #ifdef ENABLE_USER_DISPLAY_SERVER + g_array_prepend_val (search_array, wayland_search_dir); + +- for (i = 0; system_data_dirs[i]; i++) { +- gchar *dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL); +- g_array_insert_val (search_array, i, dir); +- } + #else +- for (i = 0; system_data_dirs[i]; i++) { +- gchar *dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL); +- g_array_append_val (search_array, dir); +- } +- + g_array_append_val (search_array, wayland_search_dir); + #endif + } +diff --git a/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c +index afbc5c0..bb5e3e6 100644 +--- a/libgdm/gdm-sessions.c ++++ b/libgdm/gdm-sessions.c +@@ -238,19 +238,11 @@ collect_sessions (void) + "/etc/X11/sessions/", + DMCONFDIR "/Sessions/", + DATADIR "/gdm/BuiltInSessions/", +- DATADIR "/xsessions/", +- NULL ++ "/run/current-system/profile/share/xsessions/" + }; + + xorg_search_array = g_array_new (TRUE, TRUE, sizeof (char *)); + +- const gchar * const *system_data_dirs = g_get_system_data_dirs (); +- +- for (i = 0; system_data_dirs[i]; i++) { +- session_dir = g_build_filename (system_data_dirs[i], "xsessions", NULL); +- g_array_append_val (xorg_search_array, session_dir); +- } +- + g_array_append_vals (xorg_search_array, xorg_search_dirs, G_N_ELEMENTS (xorg_search_dirs)); + + #ifdef ENABLE_WAYLAND_SUPPORT +@@ -261,11 +253,6 @@ collect_sessions (void) + + wayland_search_array = g_array_new (TRUE, TRUE, sizeof (char *)); + +- for (i = 0; system_data_dirs[i]; i++) { +- session_dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL); +- g_array_append_val (wayland_search_array, session_dir); +- } +- + g_array_append_vals (wayland_search_array, wayland_search_dirs, G_N_ELEMENTS (wayland_search_dirs)); + #endif + -- cgit v1.2.3 From 92e52d25adbb684ae943be396ee27273d9475afc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Apr 2020 18:38:23 +0200 Subject: gnu: txr: Call ./configure manually instead of patching. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lisp.scm (txr)[source]: Remove patch. [arguments]: Add ‘--prefix’ to #:configure-flags. Use a custom ‘configure’ phase. * gnu/packages/patches/txr-shell.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/lisp.scm | 29 ++++++++++++------ gnu/packages/patches/txr-shell.patch | 59 ------------------------------------ 3 files changed, 19 insertions(+), 70 deletions(-) delete mode 100644 gnu/packages/patches/txr-shell.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index ac5fb0cfd1..65e51a3541 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1480,7 +1480,6 @@ dist_patch_DATA = \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \ %D%/packages/patches/tomb-fix-errors-on-open.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ - %D%/packages/patches/txr-shell.patch \ %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/udiskie-no-appindicator.patch \ diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index b35fa3225a..d7ad0a0db0 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -853,22 +853,31 @@ enough to play the original mainframe Zork all the way through.") (url "http://www.kylheku.com/git/txr/") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) - (patches (search-patches "txr-shell.patch")) (sha256 (base32 "0c9qsj4xwc24c9g02mr5n97m4d87d4n0pcc2c2n58l2vg5dnzba0")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("cc=gcc") + '(#:configure-flags + (list "cc=gcc" + (string-append "--prefix=" (assoc-ref %outputs "out"))) #:test-target "tests" - #:phases (modify-phases %standard-phases - (add-after 'configure 'fix-tests - (lambda _ - (substitute* "tests/017/realpath.tl" - (("/usr/bin") "/")) - (substitute* "tests/017/realpath.expected" - (("/usr/bin") "/")) - #t))))) + #:phases + (modify-phases %standard-phases + (replace 'configure + ;; ./configure is a hand-written script that can't handle standard + ;; autotools arguments like CONFIG_SHELL. + (lambda* (#:key configure-flags #:allow-other-keys) + (setenv "txr_shell" (which "bash")) + (apply invoke "./configure" configure-flags) + #t)) + (add-after 'configure 'fix-tests + (lambda _ + (substitute* "tests/017/realpath.tl" + (("/usr/bin") "/")) + (substitute* "tests/017/realpath.expected" + (("/usr/bin") "/")) + #t))))) (native-inputs `(("bison" ,bison) ("flex" ,flex))) diff --git a/gnu/packages/patches/txr-shell.patch b/gnu/packages/patches/txr-shell.patch deleted file mode 100644 index a4abb73eac..0000000000 --- a/gnu/packages/patches/txr-shell.patch +++ /dev/null @@ -1,59 +0,0 @@ -Use the current shell instead of trying to find another one and -failing to do so. - -diff --git a/configure b/configure -index f1adb919..7891b4dc 100755 ---- a/configure -+++ b/configure -@@ -26,28 +26,6 @@ - # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - --# --# The #!/bin/sh might be some legacy piece of crap, --# not even up to 1990 POSIX.2 spec. So the first step --# is to look for a better shell in some known places --# and re-execute ourselves with that interpreter. --# -- --if test x$txr_shell = x ; then -- for shell in /bin/bash /usr/bin/bash /usr/xpg4/bin/sh ; do -- if test -x $shell ; then -- txr_shell=$shell -- break -- fi -- done -- if test x$txr_shell = x ; then -- echo "No known POSIX shell found: falling back on /bin/sh, which may not work" -- txr_shell=/bin/sh -- fi -- export txr_shell -- exec $txr_shell $0 ${@+"$@"} --fi -- - set -u - - # -@@ -190,13 +168,6 @@ while [ $# -gt 0 ] ; do - exit 1 - fi - -- eval "var_exists=\${$var+y}" -- -- if [ "$var_exists" != y ] ; then -- printf "$0: nonexistent option: '%s'\n" "$1" -- exit 1 -- fi -- - eval "$var='$val'" - - eval "var_given_exists=\${${var}_given+y}" -@@ -208,6 +179,8 @@ while [ $# -gt 0 ] ; do - shift - done - -+txr_shell=$CONFIG_SHELL -+ - # - # If --help was given (or --help= or help=) then - # print help and exit. The termination status is failed, to indicate -- cgit v1.2.3 From ff2bf8a2239a041b934690b91cb613c43d2963b9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Apr 2020 13:23:40 +0200 Subject: gnu: python-jedi: Update to 0.17.0. * gnu/packages/python-xyz.scm (python-jedi): Update to 0.17.0. [source](patches): Remove. * gnu/packages/patches/python-jedi-deleted-variables.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - .../patches/python-jedi-deleted-variables.patch | 38 ---------------------- gnu/packages/python-xyz.scm | 5 ++- 3 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 gnu/packages/patches/python-jedi-deleted-variables.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 65e51a3541..359b6db482 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1364,7 +1364,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-flint-includes.patch \ - %D%/packages/patches/python-jedi-deleted-variables.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ diff --git a/gnu/packages/patches/python-jedi-deleted-variables.patch b/gnu/packages/patches/python-jedi-deleted-variables.patch deleted file mode 100644 index 53bdc05cde..0000000000 --- a/gnu/packages/patches/python-jedi-deleted-variables.patch +++ /dev/null @@ -1,38 +0,0 @@ -Fix test failure in some environments, including Guix. - -Taken from upstream: -https://github.com/davidhalter/jedi/commit/bec87f7ff82b0731713c6520a14c213341b4cecf - -diff --git a/test/completion/basic.py b/test/completion/basic.py -index b40068179..3ff919ca6 100644 ---- a/test/completion/basic.py -+++ b/test/completion/basic.py -@@ -209,11 +209,11 @@ def global_as_import(): - - deleted_var = 3 - del deleted_var --#? int() -+#? - deleted_var --#? ['deleted_var'] -+#? [] - deleted_var --#! ['deleted_var = 3'] -+#! [] - deleted_var - - # ----------------- -diff --git a/test/test_api/test_full_name.py b/test/test_api/test_full_name.py -index 4fdb861b0..6858b6ca8 100644 ---- a/test/test_api/test_full_name.py -+++ b/test/test_api/test_full_name.py -@@ -112,7 +112,8 @@ def test_os_path(Script): - - def test_os_issues(Script): - """Issue #873""" -- assert [c.name for c in Script('import os\nos.nt''').complete()] == ['nt'] -+ # nt is not found, because it's deleted -+ assert [c.name for c in Script('import os\nos.nt''').complete()] == [] - - - def test_param_name(Script): diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 009a0696c5..20b8784c05 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11912,15 +11912,14 @@ characters, mouse support, and auto suggestions.") (define-public python-jedi (package (name "python-jedi") - (version "0.16.0") + (version "0.17.0") (source (origin (method url-fetch) (uri (pypi-uri "jedi" version)) - (patches (search-patches "python-jedi-deleted-variables.patch")) (sha256 (base32 - "1mb5kmrk9bkc3kwzx02j62cdan1jqd92q1z7h7wi9d30jg5p3j6m")))) + "0c1h9x3a9klvk2g288wl328x8xgzw7136k6vs9hkd56b85vcjh6z")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 27ed894851e19f44ba2b788bd404d2f476c27016 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Apr 2020 13:50:19 +0200 Subject: gnu: Remove libvpx@1.7. * gnu/packages/patches/libvpx-use-after-free-in-postproc.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/video.scm (libvpx-1.7): Remove variable. --- gnu/local.mk | 1 - .../libvpx-use-after-free-in-postproc.patch | 34 ---------------------- gnu/packages/video.scm | 19 ------------ 3 files changed, 54 deletions(-) delete mode 100644 gnu/packages/patches/libvpx-use-after-free-in-postproc.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 359b6db482..ba7b22e112 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1161,7 +1161,6 @@ dist_patch_DATA = \ %D%/packages/patches/libvnc-CVE-2018-20750.patch \ %D%/packages/patches/libvnc-CVE-2019-15681.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ - %D%/packages/patches/libvpx-use-after-free-in-postproc.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ %D%/packages/patches/libxt-guix-search-paths.patch \ %D%/packages/patches/lierolibre-check-unaligned-access.patch \ diff --git a/gnu/packages/patches/libvpx-use-after-free-in-postproc.patch b/gnu/packages/patches/libvpx-use-after-free-in-postproc.patch deleted file mode 100644 index 04f2a953b7..0000000000 --- a/gnu/packages/patches/libvpx-use-after-free-in-postproc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 52add5896661d186dec284ed646a4b33b607d2c7 Mon Sep 17 00:00:00 2001 -From: Jerome Jiang -Date: Wed, 23 May 2018 15:43:00 -0700 -Subject: [PATCH] VP8: Fix use-after-free in postproc. - -The pointer in vp8 postproc refers to show_frame_mi which is only -updated on show frame. However, when there is a no-show frame which also -changes the size (thus new frame buffers allocated), show_frame_mi is -not updated with new frame buffer memory. - -Change the pointer in postproc to mi which is always updated. - -Bug: 842265 -Change-Id: I33874f2112b39f74562cba528432b5f239e6a7bd ---- - vp8/common/postproc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c -index d67ee8a57..8c292d616 100644 ---- a/vp8/common/postproc.c -+++ b/vp8/common/postproc.c -@@ -65,7 +65,7 @@ void vp8_deblock(VP8_COMMON *cm, YV12_BUFFER_CONFIG *source, - double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065; - int ppl = (int)(level + .5); - -- const MODE_INFO *mode_info_context = cm->show_frame_mi; -+ const MODE_INFO *mode_info_context = cm->mi; - int mbr, mbc; - - /* The pixel thresholds are adjusted according to if or not the macroblock --- -2.19.0 - diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c811120f8b..62cc423c09 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1622,25 +1622,6 @@ To load this plugin, specify the following option when starting mpv: (license license:bsd-3) (home-page "https://www.webmproject.org/"))) -;; GNU IceCat fails to build against 1.8.0, so keep this version for now. -(define-public libvpx-1.7 - (package - (inherit libvpx) - (version "1.7.0") - (source (origin - (inherit (package-source libvpx)) - (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit (string-append "v" version)))) - (file-name (git-file-name "libvpx" version)) - (sha256 - (base32 - "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6")) - (patches - (append - (origin-patches (package-source libvpx)) - (search-patches "libvpx-use-after-free-in-postproc.patch"))))))) - (define-public youtube-dl (package (name "youtube-dl") -- cgit v1.2.3