public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/polylabel] rawhide: Update to mapnik fork of 2.1.0 upstream release
@ 2026-08-20 13:49 Tom Hughes
  0 siblings, 0 replies; only message in thread
From: Tom Hughes @ 2026-08-20 13:49 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/polylabel
Branch : rawhide
Commit : 881fe323dfc42036f0489f7a76692bbe98416890
Author : Tom Hughes <tom@compton.nu>
Date   : 2026-08-20T14:48:41+01:00
Stats  : +9/-53 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/polylabel/c/881fe323dfc42036f0489f7a76692bbe98416890?branch=rawhide

Log:
Update to mapnik fork of 2.1.0 upstream release

---
diff --git a/.gitignore b/.gitignore
index 64954b0..a4a18ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /polylabel-2.0.0.tar.gz
 /polylabel-2.0.1.tar.gz
+/polylabel-2.1.0.tar.gz

diff --git a/polylabel-mason.patch b/polylabel-mason.patch
deleted file mode 100644
index 7a56f18..0000000
--- a/polylabel-mason.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From b92439492b37d7121ccd378e2fff4157884f22ee Mon Sep 17 00:00:00 2001
-From: Tom Hughes <tom@compton.nu>
-Date: Tue, 18 Jun 2024 00:05:23 +0100
-Subject: [PATCH] Drop mason dependency handling
-
----
- Makefile | 19 +------------------
- 1 file changed, 1 insertion(+), 18 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ef73718..87d1fa1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,26 +1,9 @@
- CXXFLAGS += -Iinclude -std=c++14 -Wall -Wextra -Wshadow -Werror -Wno-class-memaccess -g -fPIC
- 
--MASON ?= .mason/mason
--VARIANT = variant 1.1.4
--GEOMETRY = geometry 0.9.2
--RAPIDJSON = rapidjson 1.1.0
--
--$(MASON):
--	git submodule update --init
--
--DEPS = `$(MASON) cflags $(VARIANT)` \
--	`$(MASON) cflags $(GEOMETRY)` \
--	`$(MASON) cflags $(RAPIDJSON)`
--
--mason_packages/headers/geometry: $(MASON)
--	$(MASON) install $(VARIANT)
--	$(MASON) install $(GEOMETRY)
--	$(MASON) install $(RAPIDJSON)
--
- build:
- 	mkdir -p build
- 
--build/test: test/test.cpp include/mapbox/polylabel.hpp build mason_packages/headers/geometry
-+build/test: test/test.cpp include/mapbox/polylabel.hpp build
- 	$(CXX) $(CFLAGS) $(CXXFLAGS) $(DEPS) $< -o $@
- 
- test: build/test
--- 
-2.45.2
-

diff --git a/polylabel.spec b/polylabel.spec
index 955766d..9c68634 100644
--- a/polylabel.spec
+++ b/polylabel.spec
@@ -1,17 +1,15 @@
 %global debug_package %{nil}
 
 Name:           polylabel
-Version:        2.0.1
-Release:        6%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        A fast algorithm for finding the pole of inaccessibility of a polygon
 
 License:        ISC
-URL:            https://github.com/mapbox/polylabel/
-Source0:        https://github.com/mapbox/polylabel/archive/v%{version}/%{name}-%{version}.tar.gz
-# Disable mason dependency handling
-Patch:          polylabel-mason.patch
+URL:            https://github.com/mapnik/polylabel/
+Source0:        https://github.com/mapnik/polylabel/archive/v%{version}/%{name}-%{version}.tar.gz
 
-BuildRequires:  make gcc-c++
+BuildRequires:  gcc-c++
 BuildRequires:  geometry-hpp-devel geometry-hpp-static
 BuildRequires:  rapidjson-devel rapidjson-static
 
@@ -40,6 +38,7 @@ Useful for optimal placement of a text label on a polygon.
 
 
 %build
+$CXX $CXXFLAGS -Iinclude -o test/test test/test.cpp 
 
 
 %install
@@ -48,7 +47,7 @@ cp -pr include/mapbox %{buildroot}%{_includedir}
 
 
 %check
-%make_build test
+./test/test
 
 
 %files devel

diff --git a/sources b/sources
index 8ccd8d7..8e5c57a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (polylabel-2.0.1.tar.gz) = e739b0f9c293fd1fd50de56be0804b638ad4ca5ca2c6ee6272907cffc99e133f183f62dd75ca415983ebf9a03da07910b2fa5e8d18b606a6faf7b14baa930622
+SHA512 (polylabel-2.1.0.tar.gz) = e01a34e6c5e3d93fce105ef63fe26bc247bb2433db3b87068feda27da761d2a6fb948c246885d2573fb05d3706994a5543226837ce5e4f0499011cd86acc19e4

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-20 13:49 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-20 13:49 [rpms/polylabel] rawhide: Update to mapnik fork of 2.1.0 upstream release Tom Hughes

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox