diff options
| -rw-r--r-- | .SRCINFO | 17 | ||||
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | PKGBUILD | 45 | ||||
| -rw-r--r-- | configurableMenus.patch | 53 |
4 files changed, 93 insertions, 26 deletions
@@ -1,17 +1,20 @@ -pkgbase = cinnamon-applet-global-appmenu-git +pkgbase = cinnamon-applet-global-appmenu pkgdesc = Cinnamon applet. Integrates the Ubuntu AppMenu (Global Menu) support into Cinnamon Desktop. - pkgver = r99.d9eb339 + pkgver = 0.6.git20160913.5b55d2d.fc28 pkgrel = 1 url = https://github.com/jake-phy/WindowIconList arch = any license = GPL - makedepends = git + makedepends = rpmextract depends = cinnamon - depends = unity-gtk-module-standalone-bzr + depends = appmenu-gtk-module-git provides = cinnamon-applet-global-appmenu conflicts = cinnamon-applet-global-appmenu - source = cinnamon-applet-global-appmenu-git::git+https://github.com/lestcape/Global-AppMenu.git - md5sums = SKIP + replaces = cinnamon-applet-global-appmenu-git + source = http://dl.fedoraproject.org/pub/fedora-secondary/releases/28/Everything/i386/os/Packages/c/cinnamon-applet-globalappmenu-0.6-4.git20160913.5b55d2d.fc28.noarch.rpm + source = configurableMenus.patch + md5sums = edb90f3245d993a347f9206e362d6fc1 + md5sums = 3d7b129e6ee0aaabc772c4ff9479d726 -pkgname = cinnamon-applet-global-appmenu-git +pkgname = cinnamon-applet-global-appmenu diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..ff593b26db93 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +pkg/ +src/ +*.rpm +*.pkg.tar.xz @@ -1,34 +1,41 @@ # Maintainer: surefire <surefire@cryptomile.net> - -pkgname='cinnamon-applet-global-appmenu-git' -pkgver=r99.d9eb339 +pkgname='cinnamon-applet-global-appmenu' +pkgver=0.6.git20160913.5b55d2d.fc28 pkgrel=1 + pkgdesc='Cinnamon applet. Integrates the Ubuntu AppMenu (Global Menu) support into Cinnamon Desktop.' arch=('any') url='https://github.com/jake-phy/WindowIconList' license=('GPL') -depends=('cinnamon' 'unity-gtk-module-standalone-bzr') -makedepends=('git') + +depends=('cinnamon' 'appmenu-gtk-module-git') +makedepends=('rpmextract') provides=('cinnamon-applet-global-appmenu') conflicts=('cinnamon-applet-global-appmenu') -source=("${pkgname}::git+https://github.com/lestcape/Global-AppMenu.git") -md5sums=(SKIP) -_appletname='globalAppMenu@lestcape' -_appletdir="usr/share/cinnamon/applets/${_appletname}" +replaces=('cinnamon-applet-global-appmenu-git') -pkgver() { - cd "${pkgname}" - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +source=( + http://dl.fedoraproject.org/pub/fedora-secondary/releases/28/Everything/i386/os/Packages/c/cinnamon-applet-globalappmenu-0.6-4.git20160913.5b55d2d.fc28.noarch.rpm + configurableMenus.patch +) +md5sums=( + 'edb90f3245d993a347f9206e362d6fc1' + '3d7b129e6ee0aaabc772c4ff9479d726' +) + +_appletname=globalAppMenu@lestcape + +prepare() { + rpmextract.sh cinnamon-applet-globalappmenu-0.6-4.git20160913.5b55d2d.fc28.noarch.rpm + patch usr/share/cinnamon/applets/$_appletname/configurableMenus.js -i configurableMenus.patch } package() { - cd "${pkgname}" - install -dm0755 "${pkgdir}/${_appletdir}" - find "${_appletname}" -maxdepth 1 -type f -exec install -m0644 '{}' "${pkgdir}/${_appletdir}" \; - install -dm0755 "${pkgdir}/${_appletdir}/interfaces-xml" - find "${_appletname}/interfaces-xml" -maxdepth 1 -type f -exec install -m0644 '{}' "${pkgdir}/${_appletdir}/interfaces-xml" \; - - for mo in "${_appletname}/po/mo/"*.mo; do + install -d $pkgdir/usr + cp -a usr $pkgdir + rm -rf $pkgdir/usr/share/cinnamon/applets/$_appletname/po + + for mo in "usr/share/cinnamon/applets/$_appletname/po/mo/"*.mo; do local lang=$(basename "$mo" .mo) install -dm0755 "${pkgdir}/usr/share/locale/${lang}/LC_MESSAGES" install -m0644 "$mo" "${pkgdir}/usr/share/locale/${lang}/LC_MESSAGES/${_appletname}.mo" diff --git a/configurableMenus.patch b/configurableMenus.patch new file mode 100644 index 000000000000..5e99e66bd11f --- /dev/null +++ b/configurableMenus.patch @@ -0,0 +1,53 @@ +*** configurableMenus.js.bak 2018-12-19 16:25:08.000000000 +0200 +--- configurableMenus.js 2018-12-19 16:41:25.000000000 +0200 +*************** +*** 714,720 **** + let margin = (4 * borderRadius + borderWidth + arrowBase); + let halfMargin = margin / 2; + +! let themeNode = this.actor.get_theme_node(); + let gap = themeNode.get_length('-boxpointer-gap'); + + let resX, resY; +--- 714,720 ---- + let margin = (4 * borderRadius + borderWidth + arrowBase); + let halfMargin = margin / 2; + +! //let themeNode = this.actor.get_theme_node(); + let gap = themeNode.get_length('-boxpointer-gap'); + + let resX, resY; +*************** +*** 5593,5599 **** + //return portSize; + let spaceBox = new Clutter.ActorBox(); + x = box.x1 + leftEmptySpace; +! let spaceBox = this._calculateSpaceBox(this._spaceActor, x, y, box); + this._spaceActor.allocate(spaceBox, flags); + this.box.set_skip_paint(this._spaceActor, false); + //Main.notify("" + spaceBox.y2 + "-" + spaceBox.y1 + "-" + spaceBox.x2 + "-" + spaceBox.x1); +--- 5593,5599 ---- + //return portSize; + let spaceBox = new Clutter.ActorBox(); + x = box.x1 + leftEmptySpace; +! spaceBox = this._calculateSpaceBox(this._spaceActor, x, y, box); + this._spaceActor.allocate(spaceBox, flags); + this.box.set_skip_paint(this._spaceActor, false); + //Main.notify("" + spaceBox.y2 + "-" + spaceBox.y1 + "-" + spaceBox.x2 + "-" + spaceBox.x1); +*************** +*** 6811,6817 **** + PopupMenu using a non instance of the class PopupMenuAbstractFactory"); + } + // The shell menu +! let shellItem = this._createShellItem(factoryMenu, launcher, orientation, menuManager); + this._attachToMenu(shellItem, factoryMenu); + this._menuManager.push(menuManager); + return shellItem; +--- 6811,6817 ---- + PopupMenu using a non instance of the class PopupMenuAbstractFactory"); + } + // The shell menu +! shellItem = this._createShellItem(factoryMenu, launcher, orientation, menuManager); + this._attachToMenu(shellItem, factoryMenu); + this._menuManager.push(menuManager); + return shellItem; |