From: "Tim Harder" <radhermit@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
Date: Sun, 17 Jun 2018 09:18:01 +0000 (UTC) [thread overview]
Message-ID: <1529227029.eb8eb034f24b8ebb15af1f1e8310c184c7fb4609.radhermit@gentoo> (raw)
commit: eb8eb034f24b8ebb15af1f1e8310c184c7fb4609
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 16 19:38:24 2018 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sun Jun 17 09:17:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb8eb034
x11-terms/kitty: version bump to 0.11.0
x11-terms/kitty/Manifest | 1 +
x11-terms/kitty/files/kitty-0.11.0-flags.patch | 47 ++++++++++++++++++++++
x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch | 16 ++++++++
.../{kitty-9999.ebuild => kitty-0.11.0.ebuild} | 10 +++--
x11-terms/kitty/kitty-9999.ebuild | 10 +++--
5 files changed, 76 insertions(+), 8 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 564ba428337..bf8f4bdaf65 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,2 +1,3 @@
DIST kitty-0.10.1.tar.gz 3844251 BLAKE2B f2b1e523ae48415c410080ae0b419c96e394bfc145da4c3f73fe865e2b1fbd6f7c8ffd18d4e14ea09c0397b8fceb35ebfce72a49d731886588acea5135d4615a SHA512 5341ebdec5356665db5ed0b9f910dac66860b0b39334c0878a3af637bd3da983c11ab8425794e8ea7b3c90f6d64855d8acda4531f25726c01ab355293f033a08
+DIST kitty-0.11.0.tar.gz 3907898 BLAKE2B aed74721a332b41cdfb798097797a4e59c1743d32bf2ae6bf5d90eb571acc5ab93c27f837f17de0f79dcece55ba58b6d178a01df980f19fd5d5c5c11337dba4d SHA512 33e9d0a8de5531d9dad341054dde7986eee9ad9ef1c97809c6ee7f3a5fc5ae210eff59ac02e571c31f233676329143f38f4e95d8971d28b21e6befc362e46984
DIST kitty-0.9.1.tar.gz 3698447 BLAKE2B f7e5c4d365f4fa3f74a348b219ea2433fc1ad05cca68a5ba920b692a4dd5de63fb27cd28159de3af3f11e9a87911bc8600c342ee2bc733317f91e9a7b6226e15 SHA512 3690dd7308f37de3282148c80e2afffde08e4dc2c459f78668d461461ff5dad2b39127635cf22f0f160f40823d2fa1a43a7e83d4bcc0b64e4cbc6e5be1988329
diff --git a/x11-terms/kitty/files/kitty-0.11.0-flags.patch b/x11-terms/kitty/files/kitty-0.11.0-flags.patch
new file mode 100644
index 00000000000..44abfb669a0
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.11.0-flags.patch
@@ -0,0 +1,47 @@
+--- kitty-0.11.0/setup.py
++++ kitty-0.11.0/setup.py
+@@ -177,7 +177,7 @@
+ df = '-g3'
+ if ccver >= (5, 0):
+ df += ' -Og'
+- optimize = df if debug or sanitize else '-O3'
++ optimize = ''
+ sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
+ cppflags = os.environ.get(
+ 'OVERRIDE_CPPFLAGS', (
+@@ -190,7 +190,7 @@
+ cflags = os.environ.get(
+ 'OVERRIDE_CFLAGS', (
+ '-Wextra -Wno-missing-field-initializers -Wall -std=c99'
+- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
++ ' -pedantic {} {} -fwrapv {} {} {} -fvisibility=hidden'
+ ).format(
+ optimize,
+ ' '.join(sanitize_args),
+@@ -204,7 +204,7 @@
+ )
+ ldflags = os.environ.get(
+ 'OVERRIDE_LDFLAGS',
+- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
++ '-Wall ' + ' '.join(sanitize_args)
+ )
+ ldflags = shlex.split(ldflags)
+ ldflags.append('-shared')
+@@ -505,14 +505,14 @@
+
+
+ def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=False):
+- cflags = '-Wall -Werror -fpie'.split()
++ cflags = '-Wall -fpie'.split()
+ cppflags = []
+ libs = []
+ if args.profile:
+ cppflags.append('-DWITH_PROFILER'), cflags.append('-g')
+ libs.append('-lprofiler')
+- else:
+- cflags.append('-O3')
++ #else:
++ # cflags.append('-O3')
+ if for_bundle or for_freeze:
+ cppflags.append('-DFOR_BUNDLE')
+ cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
diff --git a/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch b/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch
new file mode 100644
index 00000000000..97e45c677f8
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch
@@ -0,0 +1,16 @@
+Use SVG icon instead of PNG.
+
+--- kitty-0.11.0/setup.py
++++ kitty-0.11.0/setup.py
+@@ -605,9 +605,9 @@
+ if not is_macos: # {{{ linux desktop gunk
+ copy_man_pages(ddir)
+ copy_html_docs(ddir)
+- icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', '256x256', 'apps')
++ icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', 'scalable', 'apps')
+ safe_makedirs(icdir)
+- shutil.copy2('logo/kitty.png', icdir)
++ shutil.copy2('logo/kitty.svg', icdir)
+ deskdir = os.path.join(ddir, 'share', 'applications')
+ safe_makedirs(deskdir)
+ with open(os.path.join(deskdir, 'kitty.desktop'), 'w') as f:
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-0.11.0.ebuild
similarity index 90%
copy from x11-terms/kitty/kitty-9999.ebuild
copy to x11-terms/kitty/kitty-0.11.0.ebuild
index a458d0c6738..e1bdc32f631 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-0.11.0.ebuild
@@ -45,11 +45,12 @@ RDEPEND="
"
DEPEND="${RDEPEND}
virtual/pkgconfig
+ dev-python/sphinx[${PYTHON_USEDEP}]
"
PATCHES=(
- "${FILESDIR}"/${PN}-0.9.1-flags.patch
- "${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
+ "${FILESDIR}"/${PN}-0.11.0-flags.patch
+ "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
)
src_prepare() {
@@ -60,6 +61,9 @@ src_prepare() {
sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
fi
+ # respect doc dir
+ sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
+
tc-export CC
}
@@ -81,8 +85,6 @@ src_install() {
mkdir -p "${ED}"usr || die
cp -r linux-package/* "${ED}usr" || die
python_fix_shebang "${ED}"
-
- dodoc CHANGELOG.rst *.asciidoc
}
pkg_postinst() {
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index a458d0c6738..e1bdc32f631 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -45,11 +45,12 @@ RDEPEND="
"
DEPEND="${RDEPEND}
virtual/pkgconfig
+ dev-python/sphinx[${PYTHON_USEDEP}]
"
PATCHES=(
- "${FILESDIR}"/${PN}-0.9.1-flags.patch
- "${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
+ "${FILESDIR}"/${PN}-0.11.0-flags.patch
+ "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
)
src_prepare() {
@@ -60,6 +61,9 @@ src_prepare() {
sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
fi
+ # respect doc dir
+ sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
+
tc-export CC
}
@@ -81,8 +85,6 @@ src_install() {
mkdir -p "${ED}"usr || die
cp -r linux-package/* "${ED}usr" || die
python_fix_shebang "${ED}"
-
- dodoc CHANGELOG.rst *.asciidoc
}
pkg_postinst() {
next reply other threads:[~2018-06-17 9:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-17 9:18 Tim Harder [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-05 15:23 [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/ Ionen Wolkens
2023-08-11 4:59 Ionen Wolkens
2021-11-03 6:41 Ionen Wolkens
2021-11-03 6:41 Ionen Wolkens
2021-10-17 20:39 John Helmert III
2021-06-11 7:21 Joonas Niilola
2021-02-02 13:08 Joonas Niilola
2020-05-01 15:09 Joonas Niilola
2020-04-04 7:39 Joonas Niilola
2020-01-09 6:01 Joonas Niilola
2019-12-03 13:13 Joonas Niilola
2019-11-12 4:00 Tim Harder
2019-08-31 10:28 Tim Harder
2019-08-31 10:28 Tim Harder
2019-07-16 23:17 Matthew Thode
2019-06-15 21:27 Tim Harder
2018-06-05 4:34 Tim Harder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1529227029.eb8eb034f24b8ebb15af1f1e8310c184c7fb4609.radhermit@gentoo \
--to=radhermit@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox