From 8e27618ecf5bd879cd179f7a07b53a097f3f348b Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 23 Oct 2018 12:59:06 +0200 Subject: remove hard coded architectures from architecture hacking (e.g. use "${arch[@]}" instead of "i486 i686 pentium3 x86_64") --- extra/doxygen/PKGBUILD | 2 +- extra/gtkmm3/PKGBUILD | 2 +- extra/icedtea-web/PKGBUILD | 2 +- extra/java-openjfx/PKGBUILD | 4 ++-- extra/libpst/PKGBUILD | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'extra') diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index 0095f04c..45a93ff5 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,7 +1,7 @@ eval "$( declare -f package_doxygen | \ sed ' - 2 a arch=(i486 i686 pentium3 x86_64) + 2 a arch=('"${arch[@]}"') ' declare -f package_doxygen-doc | \ sed ' diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD index 1e89309a..de2bf047 100644 --- a/extra/gtkmm3/PKGBUILD +++ b/extra/gtkmm3/PKGBUILD @@ -1,7 +1,7 @@ eval "$( declare -f package_gtkmm3 | \ sed ' - 2 a arch=(i486 i686 pentium3 x86_64) + 2 a arch=('"${arch[@]}"') ' declare -f package_gtkmm3-docs | \ sed ' diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD index d8c186ad..e83c6850 100644 --- a/extra/icedtea-web/PKGBUILD +++ b/extra/icedtea-web/PKGBUILD @@ -1,7 +1,7 @@ eval "$( declare -f package_icedtea-web | \ sed ' - 2 a arch=(i486 i686 pentium3 x86_64) + 2 a arch=('"${arch[@]}"') ' declare -f package_icedtea-web-doc | \ sed ' diff --git a/extra/java-openjfx/PKGBUILD b/extra/java-openjfx/PKGBUILD index c8a26318..1a215076 100644 --- a/extra/java-openjfx/PKGBUILD +++ b/extra/java-openjfx/PKGBUILD @@ -1,11 +1,11 @@ eval "$( declare -f package_java-openjfx | \ sed ' - 2 a arch=(i486 i686 pentium3 x86_64) + 2 a arch=('"${arch[@]}"') ' declare -f package_java-openjfx-src | \ sed ' - 2 a arch=(i486 i686 pentium3 x86_64) + 2 a arch=('"${arch[@]}"') ' declare -f package_java-openjfx-doc | \ sed ' diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD index 8ebd9181..5b0e2fb4 100644 --- a/extra/libpst/PKGBUILD +++ b/extra/libpst/PKGBUILD @@ -1,7 +1,7 @@ eval "$( declare -f package_libpst | \ sed ' - 2 a arch=(i486 i686 pentium3 x86_64) + 2 a arch=('"${arch[@]}"') ' declare -f package_libpst-docs | \ sed ' -- cgit v1.2.3-70-g09d2 From 77a5faaa6ea7f89e6866424e4012884d8e0fb3fe Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 25 Oct 2018 09:56:48 +0200 Subject: extra/libgit2: removed patch for _FILE_OFFSET_BITS=64 in test cmakefile --- extra/libgit2/PKGBUILD | 9 --------- extra/libgit2/libgit2-ssp-offset64-stat-buf.patch | 12 ------------ 2 files changed, 21 deletions(-) delete mode 100644 extra/libgit2/PKGBUILD delete mode 100644 extra/libgit2/libgit2-ssp-offset64-stat-buf.patch (limited to 'extra') diff --git a/extra/libgit2/PKGBUILD b/extra/libgit2/PKGBUILD deleted file mode 100644 index e0b17681..00000000 --- a/extra/libgit2/PKGBUILD +++ /dev/null @@ -1,9 +0,0 @@ -# See: https://github.com/libgit2/libgit2/pull/4631 - -source+=('libgit2-ssp-offset64-stat-buf.patch') -sha256sums+=('4eceeb944c7ea2dd2f879a279d5eb0f80ae32675410a6601bcc07ccd0189e8cf') - -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i "$srcdir/libgit2-ssp-offset64-stat-buf.patch" -} diff --git a/extra/libgit2/libgit2-ssp-offset64-stat-buf.patch b/extra/libgit2/libgit2-ssp-offset64-stat-buf.patch deleted file mode 100644 index a6ee91d9..00000000 --- a/extra/libgit2/libgit2-ssp-offset64-stat-buf.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 775f33f2d..e73e7237c 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -9,6 +9,7 @@ SET(CLAR_FIXTURES "${CMAKE_CURRENT_SOURCE_DIR}/resources/") - SET(CLAR_PATH "${CMAKE_CURRENT_SOURCE_DIR}") - ADD_DEFINITIONS(-DCLAR_FIXTURE_PATH=\"${CLAR_FIXTURES}\") - ADD_DEFINITIONS(-DCLAR_TMPDIR=\"libgit2_tests\") -+ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64) - - INCLUDE_DIRECTORIES(${CLAR_PATH} ${libgit2_BINARY_DIR}/src) - FILE(GLOB_RECURSE SRC_TEST ${CLAR_PATH}/*/*.c ${CLAR_PATH}/*/*.h) -- cgit v1.2.3-70-g09d2 From d0a0b0a7564da67005570735027ab94b4283188e Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Mon, 29 Oct 2018 18:14:19 +0100 Subject: extra/xfce4-diskperf-plugin: hotfix for FS#60632 --- extra/xfce4-diskperf-plugin/PKGBUILD | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 extra/xfce4-diskperf-plugin/PKGBUILD (limited to 'extra') diff --git a/extra/xfce4-diskperf-plugin/PKGBUILD b/extra/xfce4-diskperf-plugin/PKGBUILD new file mode 100644 index 00000000..f42f1cb5 --- /dev/null +++ b/extra/xfce4-diskperf-plugin/PKGBUILD @@ -0,0 +1,5 @@ +# see https://bugs.archlinux.org/task/60632 +prepare() { + cd $pkgname-$pkgver + sed -i '/#include / a #include /' panel-plugin/devperf.c +} -- cgit v1.2.3-70-g09d2 From c980d934f2ffb085002debe9e4c863b5e5f48934 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Wed, 31 Oct 2018 19:25:42 +0100 Subject: extra/python2: disabled test "test_ssl" --- extra/python2/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extra') diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index 5b876d5a..c012a42d 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -14,7 +14,7 @@ eval "$( ' declare -f check | \ sed ' - /xvfb-run/ s/-x test_idle/-x test_idle test_bytes test_str test_string test_unicode test_userstring test_tuple/ + /xvfb-run/ s/-x test_idle/-x test_idle test_bytes test_str test_string test_unicode test_userstring test_tuple test_ssl/ s/ -m test.regrtest/ -m test.regrtest -j1/ ' )" -- cgit v1.2.3-70-g09d2