From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A59F81382BD for ; Fri, 17 Jun 2016 14:59:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3D90E09E5; Fri, 17 Jun 2016 14:59:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 299EAE09F7 for ; Fri, 17 Jun 2016 14:59:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 796443403C1 for ; Fri, 17 Jun 2016 14:59:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B57A2412 for ; Fri, 17 Jun 2016 14:59:51 +0000 (UTC) From: "Amy Winston" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amy Winston" Message-ID: <1466175282.cd5789a45d77f688939d4ad3aadf3c11ff21f13d.amynka@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/gdal/files/gdal-1.8.1-zlib_header_fix.patch sci-libs/gdal/files/gdal-1.9.1-ruby-makefile.patch X-VCS-Directories: sci-libs/gdal/files/ X-VCS-Committer: amynka X-VCS-Committer-Name: Amy Winston X-VCS-Revision: cd5789a45d77f688939d4ad3aadf3c11ff21f13d X-VCS-Branch: master Date: Fri, 17 Jun 2016 14:59:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 06308e02-04a6-489b-8b31-ee29d58fe5f9 X-Archives-Hash: a3cd854ce3c71f762a92d41a95d9461f commit: cd5789a45d77f688939d4ad3aadf3c11ff21f13d Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Jun 11 20:43:59 2016 +0000 Commit: Amy Winston gentoo org> CommitDate: Fri Jun 17 14:54:42 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd5789a4 sci-libs/gdal: Remove unused patches Package-Manager: portage-2.2.28 .../gdal/files/gdal-1.8.1-zlib_header_fix.patch | 13 ------- sci-libs/gdal/files/gdal-1.9.1-ruby-makefile.patch | 43 ---------------------- 2 files changed, 56 deletions(-) diff --git a/sci-libs/gdal/files/gdal-1.8.1-zlib_header_fix.patch b/sci-libs/gdal/files/gdal-1.8.1-zlib_header_fix.patch deleted file mode 100644 index 04777c8..0000000 --- a/sci-libs/gdal/files/gdal-1.8.1-zlib_header_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- port/cpl_minizip_ioapi.h.orig 2011-09-25 13:38:22.000000000 -0700 -+++ port/cpl_minizip_ioapi.h 2011-09-25 13:39:22.000000000 -0700 -@@ -41,6 +41,10 @@ - #endif - #endif - -+#ifndef OF -+#define OF(x) x -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif diff --git a/sci-libs/gdal/files/gdal-1.9.1-ruby-makefile.patch b/sci-libs/gdal/files/gdal-1.9.1-ruby-makefile.patch deleted file mode 100644 index b98f684..0000000 --- a/sci-libs/gdal/files/gdal-1.9.1-ruby-makefile.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -urN gdal-1.9.1.old//swig/ruby/RubyMakefile.mk gdal-1.9.1/swig/ruby/RubyMakefile.mk ---- gdal-1.9.1.old//swig/ruby/RubyMakefile.mk 2012-05-25 19:54:12.073974979 +0200 -+++ gdal-1.9.1/swig/ruby/RubyMakefile.mk 2012-05-25 19:56:56.014977833 +0200 -@@ -37,13 +37,13 @@ - - ifeq ("$(shell uname -s)", "Darwin") - RUBY_MODULES=$(RUBY_MODULES_MAC) --LDFLAGS += -Xcompiler -bundle -L$(RUBY_LIB_DIR) --RUBY_LIB := -l$(RUBY_SO_NAME) - else - RUBY_MODULES=$(RUBY_MODULES_LIN) --LDFLAGS += -Xcompiler -shared -L$(RUBY_LIB_DIR) --RUBY_LIB := -l$(RUBY_SO_NAME) - endif -+LDFLAGS += -fPIC -DPIC -shared -L$(RUBY_LIB_DIR) -+CFLAGS += -fPIC -DPIC -+CXXFLAGS += -fPIC -DPIC -+RUBY_LIB := -l$(RUBY_SO_NAME) - - build: $(RUBY_MODULES) - -@@ -59,7 +59,7 @@ - $(INSTALL_DIR): - mkdir -p $(DESTDIR)$(INSTALL_DIR) - --install: $(INSTALL_DIR) -+install: $(INSTALL_DIR) $(RUBY_MODULES) - for i in $(RUBY_MODULES) ; do $(INSTALL) $$i $(DESTDIR)$(INSTALL_DIR) ; done - - $(RUBY_MODULES_MAC): %.bundle: %_wrap.o -@@ -69,10 +69,10 @@ - $(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@ - - %.o: %.cpp -- $(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< -+ $(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< - - %.o: %.cxx -- $(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< -+ $(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< - - %.o: %.c - $(CC) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<