* [PR PATCH] exo: Add proper cross patch
@ 2021-01-04 16:44 ndowens
2021-01-04 16:51 ` [PR REVIEW] " sgn
2021-01-04 16:52 ` [PR PATCH] [Closed]: " sgn
0 siblings, 2 replies; 3+ messages in thread
From: ndowens @ 2021-01-04 16:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 308 bytes --]
There is a new pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages exo
https://github.com/void-linux/void-packages/pull/27661
exo: Add proper cross patch
A patch file from https://github.com/void-linux/void-packages/pull/27661.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-exo-27661.patch --]
[-- Type: text/x-diff, Size: 3653 bytes --]
From b7cdcd88b6c7dac0fb363d73fd6c0aca8a57843f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 4 Jan 2021 10:35:56 -0600
Subject: [PATCH] exo: Add proper cross patch
---
srcpkgs/exo/patches/0001-cross.patch | 25 ++++++++++
.../exo/patches/configure-crosscompile.patch | 47 -------------------
srcpkgs/exo/template | 2 +-
3 files changed, 26 insertions(+), 48 deletions(-)
create mode 100644 srcpkgs/exo/patches/0001-cross.patch
delete mode 100644 srcpkgs/exo/patches/configure-crosscompile.patch
diff --git a/srcpkgs/exo/patches/0001-cross.patch b/srcpkgs/exo/patches/0001-cross.patch
new file mode 100644
index 00000000000..20d996e0b0d
--- /dev/null
+++ b/srcpkgs/exo/patches/0001-cross.patch
@@ -0,0 +1,25 @@
+From 932723e0747a30a77738f654a88c052577b5cc6e Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Mon, 4 Jan 2021 10:31:57 -0600
+Subject: [PATCH] cross
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git configure.ac configure.ac
+index 2cfd208..17d6210 100644
+--- configure.ac
++++ configure.ac
+@@ -136,7 +136,7 @@ AC_FUNC_MMAP()
+ dnl ***************************************
+ dnl *** Check for strftime() extensions ***
+ dnl ***************************************
+-AC_TRY_RUN([
++AC_COMPILE_IFELSE([
+ #include <string.h>
+ #include <time.h>
+ int
+--
+2.30.0
+
diff --git a/srcpkgs/exo/patches/configure-crosscompile.patch b/srcpkgs/exo/patches/configure-crosscompile.patch
deleted file mode 100644
index dac3a86a9bd..00000000000
--- a/srcpkgs/exo/patches/configure-crosscompile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- configure.ac.orig
-+++ configure.ac
-@@ -137,22 +137,29 @@ AC_FUNC_MMAP()
- dnl ***************************************
- dnl *** Check for strftime() extensions ***
- dnl ***************************************
--AC_TRY_RUN([
-- #include <string.h>
-- #include <time.h>
-- int
-- main (int argc, char **argv)
-- {
-- struct tm tm;
-- char buffer[16];
-- tm.tm_year = 81;
-- if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0)
-- return 0;
-- return 1;
-- }
--], [
-+AC_CACHE_CHECK([Define if strftime supports %E and %O modifiers], ac_cv_strftime_extensions,
-+ [AC_TRY_RUN([
-+ #include <string.h>
-+ #include <time.h>
-+ int
-+ main (int argc, char **argv)
-+ {
-+ struct tm tm;
-+ char buffer[16];
-+ tm.tm_year = 81;
-+ if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0)
-+ return 0;
-+ return 1;
-+ }
-+ ],
-+ ac_cv_strftime_extensions=yes,
-+ ac_cv_strftime_extensions=no,
-+ [AC_MSG_ERROR([cross-compiling, preset ac_cv_strftime_extensions=yes/no])]
-+ )]
-+)
-+if test x"$ac_cv_strftime_extensions" = x"yes"; then
- AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
--])
-+fi
-
- dnl ******************************
- dnl *** Check for i18n support ***
diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index 52ba265d7f1..2ffecf85f0a 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -4,7 +4,7 @@ version=4.16.0
revision=2
build_style=gnu-configure
configure_args="--disable-static --with-locales-dir=/usr/share/locale"
-hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
+hostmakedepends="automake xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
makedepends="gtk+-devel libxfce4ui-devel"
depends="hicolor-icon-theme desktop-file-utils"
short_desc="Extension library for the Xfce desktop environment"
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-04 16:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-04 16:44 [PR PATCH] exo: Add proper cross patch ndowens
2021-01-04 16:51 ` [PR REVIEW] " sgn
2021-01-04 16:52 ` [PR PATCH] [Closed]: " sgn
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 NNTP newsgroup(s).