Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

x11-misc/: Cleanup #4091

Closed
wants to merge 6 commits into from
Closed

x11-misc/: Cleanup #4091

wants to merge 6 commits into from

Conversation

Moiman
Copy link
Contributor

@Moiman Moiman commented Mar 1, 2017

@gentoo-repo-qa-bot gentoo-repo-qa-bot added maintainer-needed There is at least one affected package with no maintainer. Review it if you can. assigned PR successfully assigned to the package maintainer(s). labels Mar 1, 2017
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull Request assignment

Areas affected: ebuilds
Packages affected: x11-misc/basqet, x11-misc/cairo-clock, x11-misc/launchy, x11-misc/qps, x11-misc/qtfm...

x11-misc/basqet: @gentoo/Qt
x11-misc/cairo-clock: @gentoo/desktop-misc
x11-misc/launchy: @gentoo/proxy-maint (maintainer needed)
x11-misc/qps: @gentoo/Qt
x11-misc/qtfm: @gentoo/Qt, @gentoo/desktop-misc
x11-misc/xscreensaver: @gentoo/desktop-misc

@@ -23,7 +23,11 @@ S=${WORKDIR}/release_${PV}
PATCHES=( "${FILESDIR}/${P}-desktop.patch" )

src_prepare() {
qt4-r2_src_prepare
default
eqmake4 ${PN}.pro PREFIX="${EPREFIX}"/usr
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you sure eqmake4 should happen in src_prepare?

plugins/*/*.pro || die "sed failed"
qt4-r2_src_prepare
default
eqmake4 Launchy.pro PREFIX="${EPREFIX}"/usr LIBDIR="$(get_libdir)"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here, this should be in src_configure


inherit eutils qt4-r2
inherit qmake-utils
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can't remove eutils, needed for newicon and stuff

sed -i -e '/strip/d' ${PN}.pro || die "sed failed"
eqmake4 ${PN}.pro
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

-e '/MimeType=/s|$|;|' \
-e '/Categories=/s|$|;System;FileTools;|' \
${PN}.desktop || die
eqmake4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again

use pam && fperms 755 /usr/bin/${PN}
pamd_mimic_system ${PN} auth

rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rm -f "${ED%/}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml || die

transform = s/_/-/g

-cairo_clock_LDFLAGS = -Wl, --export-dynamic
+cairo_clock_LDFLAGS = -Wl, -export-dynamic
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

edit this to remove the space, -Wl, options should never contain a space

Gentoo-Bug: https://bugs.gentoo.org/452106

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Configure step gives following warning otherwise.

    Warning: GTK version 2.24.31 was found, but at least one supporting
             library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used.
             Perhaps some of the development packages are not installed?

    Warning: The GTK libraries do not seem to be available; the
             `xscreensaver-demo' program requires them.

    Warning: Use of GDK-Pixbuf was requested, but it was not found.
             The XPM library is being used instead.

             Some of the demos will not use images as much as they could.
             You should consider installing GDK-Pixbuf and re-running
             configure.  (GDK-Pixbuf is recommended over XPM, as it
             provides support for more image formats.)

Gentoo-Bug: https://bugs.gentoo.org/608982
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Package-Manager: Portage-2.3.3, Repoman-2.3.1
@gentoo-repo-qa-bot
Copy link
Collaborator

😞 The QA check for this pull request has found the following issues:

Issues inherited from Gentoo (may be modified by PR):
https://qa-reports.gentoo.org/output/gentoo-ci/54aa0bd41/output.html#app-portage/g-sorcery

@gentoo-bot gentoo-bot closed this in 5a2369b Mar 1, 2017
gentoo-bot pushed a commit that referenced this pull request Mar 1, 2017
Configure step gives following warning otherwise.

    Warning: GTK version 2.24.31 was found, but at least one supporting
             library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used.
             Perhaps some of the development packages are not installed?

    Warning: The GTK libraries do not seem to be available; the
             `xscreensaver-demo' program requires them.

    Warning: Use of GDK-Pixbuf was requested, but it was not found.
             The XPM library is being used instead.

             Some of the demos will not use images as much as they could.
             You should consider installing GDK-Pixbuf and re-running
             configure.  (GDK-Pixbuf is recommended over XPM, as it
             provides support for more image formats.)

Gentoo-Bug: https://bugs.gentoo.org/608982
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: #4091
gentoo-bot pushed a commit that referenced this pull request Mar 1, 2017
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: #4091
gentoo-bot pushed a commit that referenced this pull request Mar 1, 2017
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: #4091
gentoo-bot pushed a commit that referenced this pull request Mar 1, 2017
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: #4091
gentoo-bot pushed a commit that referenced this pull request Mar 1, 2017
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: #4091
@SoapGentoo
Copy link
Member

@Moiman maybe you want to join us on IRC so we can chat about your work and how to take it to the next level 😉 (https://wiki.gentoo.org/wiki/Project:Proxy_Maintainers, freenode, #gentoo-proxy-maint)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). maintainer-needed There is at least one affected package with no maintainer. Review it if you can.
Projects
None yet
3 participants