From 6c4d2de87e5b2418ba4edfd577b7d15a85daa211 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Fri, 25 Sep 2015 12:18:30 +0300 Subject: [PATCH] Remove unneeded patches. Fix PKGBUILD's --- .../0001-msys2-fix-introspection-build.patch | 37 ------------------- mingw-w64-cogl/PKGBUILD | 4 +- mingw-w64-ghex/PKGBUILD | 1 + .../0001-give-cc-to-gir-scanner.all.patch | 10 ----- mingw-w64-libgdata/PKGBUILD | 3 -- .../0001-give-cc-to-gir-scanner.all.patch | 10 ----- mingw-w64-libgxps/PKGBUILD | 3 -- 7 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 mingw-w64-cogl/0001-msys2-fix-introspection-build.patch delete mode 100644 mingw-w64-libgdata/0001-give-cc-to-gir-scanner.all.patch delete mode 100644 mingw-w64-libgxps/0001-give-cc-to-gir-scanner.all.patch diff --git a/mingw-w64-cogl/0001-msys2-fix-introspection-build.patch b/mingw-w64-cogl/0001-msys2-fix-introspection-build.patch deleted file mode 100644 index 0d49544363..0000000000 --- a/mingw-w64-cogl/0001-msys2-fix-introspection-build.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 09200701eb59673b026c5d829d4bbeed8f5ef62a Mon Sep 17 00:00:00 2001 -From: Lubosz Sarnecki -Date: Sun, 3 Aug 2014 13:22:17 +0200 -Subject: [PATCH] msys2: fix introspection build - ---- - cogl-pango/Makefile.am | 1 + - cogl/Makefile.am | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/cogl-pango/Makefile.am b/cogl-pango/Makefile.am -index 64d9771..5358725 100644 ---- a/cogl-pango/Makefile.am -+++ b/cogl-pango/Makefile.am -@@ -96,6 +96,7 @@ DISTCLEANFILES += ../build/win32/vs9/cogl-pango.vcproj ../build/win32/vs10/cogl- - -include $(INTROSPECTION_MAKEFILE) - - INTROSPECTION_GIRS = -+INTROSPECTION_SCANNER_ENV = CC="$(CC)" - - if HAVE_INTROSPECTION - INTROSPECTION_COMPILER_ARGS=--includedir=$(top_builddir)/cogl -diff --git a/cogl/Makefile.am b/cogl/Makefile.am -index 62d3762..43ce89a 100644 ---- a/cogl/Makefile.am -+++ b/cogl/Makefile.am -@@ -667,6 +667,7 @@ DISTCLEANFILES += ../build/win32/vs9/cogl.vcproj ../build/win32/vs10/cogl.vcxpro - -include $(INTROSPECTION_MAKEFILE) - - INTROSPECTION_GIRS = -+INTROSPECTION_SCANNER_ENV = CC="$(CC)" - - if HAVE_INTROSPECTION - Cogl-1.0.gir: libcogl.la Makefile --- -2.0.4 - diff --git a/mingw-w64-cogl/PKGBUILD b/mingw-w64-cogl/PKGBUILD index c0322c8756..d0040d045b 100644 --- a/mingw-w64-cogl/PKGBUILD +++ b/mingw-w64-cogl/PKGBUILD @@ -1,6 +1,7 @@ # Maintainer: Lubosz Sarnecki _realname=cogl +pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.22.0 pkgrel=2 @@ -17,15 +18,12 @@ depends=("${MINGW_PACKAGE_PREFIX}-pango" "${MINGW_PACKAGE_PREFIX}-gst-plugins-base") options=(!libtool strip staticlibs) source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz - "0001-msys2-fix-introspection-build.patch" "0002-windows-gl-headers.patch") md5sums=('ab684ec96848d79d22757fb3064820c8' - '66134daa1df08ebfa143b12c08f3290e' '8686270ab5eae668eae11e2606aa7ce0') prepare() { cd ${_realname}-${pkgver} - patch -p1 -i ${srcdir}/0001-msys2-fix-introspection-build.patch patch -p1 -i ${srcdir}/0002-windows-gl-headers.patch autoreconf -fiv diff --git a/mingw-w64-ghex/PKGBUILD b/mingw-w64-ghex/PKGBUILD index 1db90cb408..f69310fa0f 100644 --- a/mingw-w64-ghex/PKGBUILD +++ b/mingw-w64-ghex/PKGBUILD @@ -1,6 +1,7 @@ # Maintainer: Andrea Zagli _realname=ghex +pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=3.18.0 pkgrel=1 diff --git a/mingw-w64-libgdata/0001-give-cc-to-gir-scanner.all.patch b/mingw-w64-libgdata/0001-give-cc-to-gir-scanner.all.patch deleted file mode 100644 index d05d903b54..0000000000 --- a/mingw-w64-libgdata/0001-give-cc-to-gir-scanner.all.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libgdata-0.15.2/Makefile.am.orig 2014-06-22 14:53:43.996077200 +0400 -+++ libgdata-0.15.2/Makefile.am 2014-08-12 19:36:46.908800000 +0400 -@@ -545,6 +545,7 @@ - INTROSPECTION_GIRS = - INTROSPECTION_SCANNER_ARGS = --warn-all - INTROSPECTION_COMPILER_ARGS = -+INTROSPECTION_SCANNER_ENV = CC="$(CC)" - DISTCHECK_CONFIGURE_FLAGS += --enable-introspection - EXTRA_DIST += m4/introspection.m4 - diff --git a/mingw-w64-libgdata/PKGBUILD b/mingw-w64-libgdata/PKGBUILD index a6d6a3963a..fbe14fc15b 100644 --- a/mingw-w64-libgdata/PKGBUILD +++ b/mingw-w64-libgdata/PKGBUILD @@ -28,18 +28,15 @@ options=('strip' 'staticlibs') license=("LGPL 2.1") url="http://www.gnome.org/" source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz - 0001-give-cc-to-gir-scanner.all.patch 0002-symbols.patch 0003-wsock.patch) sha256sums=('ff280b031c50a99ed735c3fa18fbea9ae3e4cc5e3d7dd58ebae09994b01b513b' - '2184839b01d19afebf10b8ca91c79682b834c9e812e0fdeb683c69b851689d1f' 'be45b535d0d8cfb05d35ffb984b72de82130dea87e34a3a706ccc448397e102b' 'ed4c9c441ee3bf4a5279c5d212b2c1116ce443763151b71975611406310575df') prepare() { cd ${_realname}-${pkgver} - patch -p1 -i ${srcdir}/0001-give-cc-to-gir-scanner.all.patch patch -p1 -i ${srcdir}/0002-symbols.patch patch -p1 -i ${srcdir}/0003-wsock.patch diff --git a/mingw-w64-libgxps/0001-give-cc-to-gir-scanner.all.patch b/mingw-w64-libgxps/0001-give-cc-to-gir-scanner.all.patch deleted file mode 100644 index fb46a749a0..0000000000 --- a/mingw-w64-libgxps/0001-give-cc-to-gir-scanner.all.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libgxps-0.2.2/libgxps/Makefile.am.orig 2011-11-19 16:44:03.000000000 +0400 -+++ libgxps-0.2.2/libgxps/Makefile.am 2014-08-07 23:06:42.482600000 +0400 -@@ -86,6 +86,7 @@ - INTROSPECTION_GIRS = - INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all --identifier-prefix=GXPS --symbol-prefix=gxps - INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) -+INTROSPECTION_SCANNER_ENV = CC="$(CC)" - - if HAVE_INTROSPECTION - introspection_sources = $(filter-out $(NOINST_H_FILES) gxps-archive.c gxps-fonts.c gxps-images.c gxps-parse-utils.c gxps-version.h, $(libgxps_la_SOURCES)) diff --git a/mingw-w64-libgxps/PKGBUILD b/mingw-w64-libgxps/PKGBUILD index 4119f57702..139625af06 100644 --- a/mingw-w64-libgxps/PKGBUILD +++ b/mingw-w64-libgxps/PKGBUILD @@ -24,17 +24,14 @@ options=('strip' 'staticlibs') license=("LGPL 2.1") url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver:0:3}/${_realname}-${pkgver}.tar.xz - 0001-give-cc-to-gir-scanner.all.patch 0002-missing-include.patch 0003-missing-cflags-libs.patch) sha256sums=('6ea5f0ed85665a4e6702e31e38b5f1b2e5ae4f3d316a55d7f1fb1799224b4127' - '93043f118701f0b668ca567875c3f6d4f3f1036680e76bc6f160b6263dd2d6c5' '85e7ce99a0286510f44dad9468faf991b4852f0e6e19c70842a4b38fc6f71919' '880cd116af31be5108a45d524b371058553c27504e8c1b513d13d021d1259dfc') prepare() { cd ${_realname}-${pkgver} - patch -p1 -i ${srcdir}/0001-give-cc-to-gir-scanner.all.patch patch -p1 -i ${srcdir}/0002-missing-include.patch patch -p1 -i ${srcdir}/0003-missing-cflags-libs.patch