diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-01-17 04:57:36 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-01-17 04:57:36 -0200 |
| commit | 704b738774af40e71a30ed61792e4140d9b90036 (patch) | |
| tree | 72c6e3d942df61e10d764296e94b227d91b92827 | |
| parent | 5eced83c6520069cabe06ce266219eea7bb37d58 (diff) | |
| parent | fd4204945100b840e014fdb54987039e5869a214 (diff) | |
| download | abslibre-704b738774af40e71a30ed61792e4140d9b90036.tar.gz abslibre-704b738774af40e71a30ed61792e4140d9b90036.tar.bz2 abslibre-704b738774af40e71a30ed61792e4140d9b90036.zip | |
Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre/abslibre
| -rw-r--r-- | pcr/wmii-hg/PKGBUILD | 4 | ||||
| -rw-r--r-- | pcr/wmii-hg/fix-for-weird-xinerama-settings.patch | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pcr/wmii-hg/PKGBUILD b/pcr/wmii-hg/PKGBUILD index 52f636636..5c5cfc979 100644 --- a/pcr/wmii-hg/PKGBUILD +++ b/pcr/wmii-hg/PKGBUILD @@ -12,7 +12,7 @@ license=("MIT") provides=("wmii") conflicts=("wmii") -pkgrel=2 +pkgrel=3 arch=("i686" "x86_64") depends=('libxft' 'libxrandr' 'libxinerama') makedepends=('txt2tags' 'libixp') # libixp is statically linked @@ -20,7 +20,7 @@ makedepends=('txt2tags' 'libixp') # libixp is statically linked source=("https://repo.parabola.nu/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" fix-for-weird-xinerama-settings.patch) md5sums=('8228a299cb83258ab3988b6131d2cbb8' - '39a1381c701e67a71deb434b3cb74c31') + 'd8f045136a7bdf3d8ccc1001085c3c17') mkdepends=('mercurial') mksource=("$pkgname-$pkgver::hg+https://code.google.com/p/wmii/#revision=${pkgver}") diff --git a/pcr/wmii-hg/fix-for-weird-xinerama-settings.patch b/pcr/wmii-hg/fix-for-weird-xinerama-settings.patch index cf8963b9c..c61f36eea 100644 --- a/pcr/wmii-hg/fix-for-weird-xinerama-settings.patch +++ b/pcr/wmii-hg/fix-for-weird-xinerama-settings.patch @@ -21,7 +21,7 @@ diff -ru wmii-hg-2823.orig/cmd/wmii/main.c wmii-hg-2823/cmd/wmii/main.c View *v; int i, j, n, m; -@@ -178,23 +178,26 @@ +@@ -178,23 +178,27 @@ /* Reallocate screens, zero any new ones. */ rects = xinerama_screens(&n); @@ -48,11 +48,12 @@ diff -ru wmii-hg-2823.orig/cmd/wmii/main.c wmii-hg-2823/cmd/wmii/main.c + break; + } + } -+ if (j < n) {/* hit "break" */ ++ if (j < n) { /* hit "break" */ + /* remove rects[i] from rects[] */ + n--; + for(j=i; j < n; j++) + rects[j] = rects[j+1]; ++ i--; } - for(i=m-1, j=0; i >= 0; i--) - rects[j++] = r[i]; |