mirror of
https://github.com/joielechong/iso-country-flags-svg-collection.git
synced 2026-04-25 08:35:57 +03:00
[PR #3] [MERGED] Merge with linuxmint/iso-country-flags-svg-collection #12
Labels
No labels
bug
enhancement
pull-request
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
starred/iso-country-flags-svg-collection#12
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 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:
master← Head:merge_joielechong_linuxmint📝 Commits (9)
ad1b2fdFixed fill-opacity using percentages in certain flags7b1e889Added 4x3 flags: Catalonia, Galicia, Wales, Basque, UN, Olympic, Earth (Pernefeldt) and Generic.5f41beeDon't restrict build to ??.svg filenames2ef9f63Updated outdated flagsbe68242Add flag for Scotland2a65923Edit flag for Spain300c3e3Merge remote-tracking branch 'joielechong/master' into upstream14f3505Add rsvg2png build commande6b3b1aAdd 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.