[PR #3] [MERGED] Merge with linuxmint/iso-country-flags-svg-collection #12

Closed
opened 2026-03-03 13:51:50 +03:00 by kerem · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/joielechong/iso-country-flags-svg-collection/pull/3
Author: @maxyz
Created: 11/20/2016
Status: Merged
Merged: 11/22/2016
Merged by: @joielechong

Base: masterHead: merge_joielechong_linuxmint


📝 Commits (9)

  • ad1b2fd Fixed fill-opacity using percentages in certain flags
  • 7b1e889 Added 4x3 flags: Catalonia, Galicia, Wales, Basque, UN, Olympic, Earth (Pernefeldt) and Generic.
  • 5f41bee Don't restrict build to ??.svg filenames
  • 2ef9f63 Updated outdated flags
  • be68242 Add flag for Scotland
  • 2a65923 Edit flag for Spain
  • 300c3e3 Merge remote-tracking branch 'joielechong/master' into upstream
  • 14f3505 Add rsvg2png build command
  • e6b3b1a Add target that only generates the 320x240 fancy pngs

📊 Changes

12 files changed (+5036 additions, -716 deletions)

View changed files

📝 Makefile (+5 -2)
📝 scripts/build.pl (+31 -13)
svg/country-4x3/_basque.svg (+151 -0)
svg/country-4x3/_catalonia.svg (+146 -0)
svg/country-4x3/_earth_pernefeldt.svg (+327 -0)
svg/country-4x3/_galicia.svg (+1059 -0)
svg/country-4x3/_generic.svg (+223 -0)
svg/country-4x3/_olympic.svg (+253 -0)
svg/country-4x3/_scotland.svg (+107 -0)
svg/country-4x3/_united_nations.svg (+718 -0)
svg/country-4x3/_wales.svg (+135 -0)
📝 svg/country-4x3/es.svg (+1881 -701)

📄 Description

The linuxmint fork was made on 31 Aug 2012, while the
joielechong/iso-country-flags-svg-collection history contains changes up
to 21 Apr 2014. However, the linuxmint fork also contains a couple of
flag fixes that are missing in this repo.

The intention of this merge is to reduce the amount of forks for this
svg collection, picking up all fixes that are available.

I've also added a new rsvg2png command for the build.pl that uses the
rsvg-convert (which is much faster than the inkscape -> convert ->
pngcrush -> optipng sequence used by the svg2png command). And a
Makefile target "png-country-320x240-fancy" which only generates the
files that are used by the linuxmint's iso-flags-png package.

With these changes, it should be possible to just have one repo and we
can all work together.


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/joielechong/iso-country-flags-svg-collection/pull/3 **Author:** [@maxyz](https://github.com/maxyz) **Created:** 11/20/2016 **Status:** ✅ Merged **Merged:** 11/22/2016 **Merged by:** [@joielechong](https://github.com/joielechong) **Base:** `master` ← **Head:** `merge_joielechong_linuxmint` --- ### 📝 Commits (9) - [`ad1b2fd`](https://github.com/joielechong/iso-country-flags-svg-collection/commit/ad1b2fd109f8fce8350dc4e3bc60afbf433094c1) Fixed fill-opacity using percentages in certain flags - [`7b1e889`](https://github.com/joielechong/iso-country-flags-svg-collection/commit/7b1e889b6ae54b9cbccdb5fb779dc2ff569e74f6) Added 4x3 flags: Catalonia, Galicia, Wales, Basque, UN, Olympic, Earth (Pernefeldt) and Generic. - [`5f41bee`](https://github.com/joielechong/iso-country-flags-svg-collection/commit/5f41bee61ab002abe747f9ed3144b3af7725abe3) Don't restrict build to ??.svg filenames - [`2ef9f63`](https://github.com/joielechong/iso-country-flags-svg-collection/commit/2ef9f6305118e9a8f06c0f112f55220b31321a5a) Updated outdated flags - [`be68242`](https://github.com/joielechong/iso-country-flags-svg-collection/commit/be68242446780e0eb33683dbfc74553a365f789c) Add flag for Scotland - [`2a65923`](https://github.com/joielechong/iso-country-flags-svg-collection/commit/2a65923c88648bf540937dac8b8685877ebf1d7a) Edit flag for Spain - [`300c3e3`](https://github.com/joielechong/iso-country-flags-svg-collection/commit/300c3e38d1c851b5e5e2acb3574acd9e8ec657bc) Merge remote-tracking branch 'joielechong/master' into upstream - [`14f3505`](https://github.com/joielechong/iso-country-flags-svg-collection/commit/14f3505c140c43e9982970855552520b3c3040f3) Add rsvg2png build command - [`e6b3b1a`](https://github.com/joielechong/iso-country-flags-svg-collection/commit/e6b3b1af6eb6dc5d9400f6a4b3361fe6f518fd60) Add target that only generates the 320x240 fancy pngs ### 📊 Changes **12 files changed** (+5036 additions, -716 deletions) <details> <summary>View changed files</summary> 📝 `Makefile` (+5 -2) 📝 `scripts/build.pl` (+31 -13) ➕ `svg/country-4x3/_basque.svg` (+151 -0) ➕ `svg/country-4x3/_catalonia.svg` (+146 -0) ➕ `svg/country-4x3/_earth_pernefeldt.svg` (+327 -0) ➕ `svg/country-4x3/_galicia.svg` (+1059 -0) ➕ `svg/country-4x3/_generic.svg` (+223 -0) ➕ `svg/country-4x3/_olympic.svg` (+253 -0) ➕ `svg/country-4x3/_scotland.svg` (+107 -0) ➕ `svg/country-4x3/_united_nations.svg` (+718 -0) ➕ `svg/country-4x3/_wales.svg` (+135 -0) 📝 `svg/country-4x3/es.svg` (+1881 -701) </details> ### 📄 Description The linuxmint fork was made on 31 Aug 2012, while the joielechong/iso-country-flags-svg-collection history contains changes up to 21 Apr 2014. However, the linuxmint fork also contains a couple of flag fixes that are missing in this repo. The intention of this merge is to reduce the amount of forks for this svg collection, picking up all fixes that are available. I've also added a new rsvg2png command for the build.pl that uses the rsvg-convert (which is much faster than the inkscape -> convert -> pngcrush -> optipng sequence used by the svg2png command). And a Makefile target "png-country-320x240-fancy" which only generates the files that are used by the linuxmint's iso-flags-png package. With these changes, it should be possible to just have one repo and we can all work together. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
kerem 2026-03-03 13:51:50 +03:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
starred/iso-country-flags-svg-collection#12
No description provided.