From d62d99a6e0670aa7756236897e05eb094eac4335 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Aug 31 2013 07:47:05 +0000 Subject: 0.95.5-1 - version upgrade - do some more /usr/local/ replacement so that WindowMaker-extra is detected correctly --- diff --git a/.gitignore b/.gitignore index 82d733b..98c6f23 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/WindowMaker-0.95.4.tar.gz +/wmaker-crm-cd5e004127d4088df21bd62c20a9d6c61a27763b.tar.gz diff --git a/0001-Fix-incorrect-FSF-address.patch b/0001-Fix-incorrect-FSF-address.patch deleted file mode 100644 index 8535cca..0000000 --- a/0001-Fix-incorrect-FSF-address.patch +++ /dev/null @@ -1,992 +0,0 @@ -From b711e3f14164e9505857e6b4f4d43b2bda7995c9 Mon Sep 17 00:00:00 2001 -From: Andreas Bierfert -Date: Mon, 7 Jan 2013 21:27:53 +0100 -Subject: [PATCH 1/2] Fix incorrect FSF address - ---- - WINGs/data.c | 3 ++- - WINGs/error.c | 3 ++- - WINGs/findfile.c | 3 ++- - WINGs/memory.c | 3 ++- - WINGs/wruler.c | 3 ++- - WPrefs.app/po/et.po | 8 ++++---- - po/be.po | 6 +++--- - po/bg.po | 8 ++++---- - po/ca.po | 6 +++--- - po/cs.po | 8 ++++---- - po/da.po | 4 ++-- - po/de.po | 4 ++-- - po/es.po | 8 ++++---- - po/et.po | 8 ++++---- - po/fi.po | 8 ++++---- - po/fr.po | 8 ++++---- - po/hy.po | 8 ++++---- - po/it.po | 6 +++--- - po/ms.po | 4 ++-- - po/ru.po | 4 ++-- - po/sk.po | 6 +++--- - po/zh_TW.po | 4 ++-- - src/wconfig.h.in | 3 ++- - src/xutil.c | 3 ++- - util/wxcopy.c | 3 ++- - util/wxpaste.c | 3 ++- - wmlib/WMaker.h | 3 ++- - wmlib/app.c | 3 ++- - wmlib/app.h | 3 ++- - wmlib/command.c | 3 ++- - wmlib/event.c | 3 ++- - wmlib/menu.c | 3 ++- - wmlib/menu.h | 3 ++- - wrlib/alpha_combine.c | 3 ++- - wrlib/color.c | 3 ++- - wrlib/context.c | 3 ++- - wrlib/convert.c | 3 ++- - wrlib/convolve.c | 3 ++- - wrlib/draw.c | 3 ++- - wrlib/gif.c | 3 ++- - wrlib/gradient.c | 3 ++- - wrlib/jpeg.c | 3 ++- - wrlib/load.c | 3 ++- - wrlib/misc.c | 3 ++- - wrlib/nxpm.c | 3 ++- - wrlib/png.c | 3 ++- - wrlib/ppm.c | 3 ++- - wrlib/raster.c | 3 ++- - wrlib/rotate.c | 3 ++- - wrlib/save.c | 3 ++- - wrlib/scale.c | 3 ++- - wrlib/tiff.c | 3 ++- - wrlib/wraster.h | 3 ++- - wrlib/xpixmap.c | 3 ++- - wrlib/xpm.c | 3 ++- - wrlib/xutil.c | 3 ++- - 56 files changed, 132 insertions(+), 93 deletions(-) - -diff --git a/WINGs/data.c b/WINGs/data.c -index 2133b80..c1c11a6 100644 ---- a/WINGs/data.c -+++ b/WINGs/data.c -@@ -15,7 +15,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/WINGs/error.c b/WINGs/error.c -index 7cfc946..1c38daa 100644 ---- a/WINGs/error.c -+++ b/WINGs/error.c -@@ -15,7 +15,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include "wconfig.h" -diff --git a/WINGs/findfile.c b/WINGs/findfile.c -index eb50609..3418c8e 100644 ---- a/WINGs/findfile.c -+++ b/WINGs/findfile.c -@@ -15,7 +15,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include "wconfig.h" -diff --git a/WINGs/memory.c b/WINGs/memory.c -index 39c7fc9..e996e0d 100644 ---- a/WINGs/memory.c -+++ b/WINGs/memory.c -@@ -15,7 +15,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include "wconfig.h" -diff --git a/WINGs/wruler.c b/WINGs/wruler.c -index f8d4af0..3c2b12b 100644 ---- a/WINGs/wruler.c -+++ b/WINGs/wruler.c -@@ -15,7 +15,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include "WINGsP.h" -diff --git a/WPrefs.app/po/et.po b/WPrefs.app/po/et.po -index 46747c1..c856030 100644 ---- a/WPrefs.app/po/et.po -+++ b/WPrefs.app/po/et.po -@@ -426,8 +426,8 @@ msgid "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - msgstr "" - " Window Maker on vaba tarkvara. Te vőite seda edasi\n" - "levitada ja/vői muuta vastavalt GNU Üldise Avaliku Litsentsi\n" -@@ -444,8 +444,8 @@ msgstr "" - "\n" - "Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia\n" - "koos selle programmiga, kui ei, siis kontakteeruge Free\n" --"Software Foundation'iga, 59 Temple Place - Suite 330,\n" --"Boston, MA 02111-1307, USA." -+"Software Foundation'iga, 51 Franklin St, Fifth Floor,\n" -+"Boston, MA 02110-1301, USA." - - #: ../src/dialog.c:1507 - msgid "Legal" -diff --git a/po/be.po b/po/be.po -index 8c9d9af..151e618 100644 ---- a/po/be.po -+++ b/po/be.po -@@ -427,8 +427,8 @@ msgid "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - msgstr "" - " Window Maker з'яўляецца свабодным праграмным\n" - "забеспячэннем і распаўсюджваецца на ўмовах ліцэнзі\n" -@@ -441,7 +441,7 @@ msgstr "" - " Копія GNU GPL распаўсюджваецца разам з гэтай\n" - "праграмай. Калі вы атрымалі гэтую праграму без копіі\n" - "ліцэнзіі, звярніціся ў Free Software Foundation, Inc.,\n" --"59 Temple Place - Suite 330, Boston, Ma 02111-1307, USA." -+"51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." - - #: ../src/dialog.c:1621 - msgid "Legal" -diff --git a/po/bg.po b/po/bg.po -index c4df6e3..64b88de 100644 ---- a/po/bg.po -+++ b/po/bg.po -@@ -549,8 +549,8 @@ msgid "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - msgstr "" - " Уиндоу Мейкър е свободен софтуер; може да го разпространявате и/или\n" - "изменяте съгласно условията на Основната общодостъпна лицензия ГНУ,\n" -@@ -564,8 +564,8 @@ msgstr "" - "\n" - " Би трябвало а сте получили копие на Основната общодостъпна\n" - "лицензия ГНУ (GNU General Public License) заедно с тази програма; в\n" --"противен случай пишете до Free Software Foundation, Inc., 59 Temple\n" --"Place - Suite 330, Boston, MA 02111-1307, USA." -+"противен случай пишете до Free Software Foundation, Inc., 51 Franklin St,\n" -+"Fifth Floor, Boston, MA 02110-1301, USA." - - #: ../src/dialog.c:1621 - msgid "Legal" -diff --git a/po/ca.po b/po/ca.po -index c1909ee..9246ab9 100644 ---- a/po/ca.po -+++ b/po/ca.po -@@ -446,8 +446,8 @@ msgid "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - msgstr "" - " Window Maker és programari lliure; el podeu redistribuïr i/o modificar " - "sota els termes de la Llicència Pública General GNU tal com ha estat " -@@ -461,7 +461,7 @@ msgstr "" - "\n" - " Haurieu d'haver rebut una còpia de Llicència Pública General GNU " - "juntament amb aquest programa; en cas contrari demaneu-la a la Free Software " --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, E.U.A. " -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, E.U.A. " - - #: ../src/dialog.c:1551 - msgid "Legal" -diff --git a/po/cs.po b/po/cs.po -index 94f60d2..d157968 100644 ---- a/po/cs.po -+++ b/po/cs.po -@@ -433,8 +433,8 @@ msgid "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - msgstr "" - "Window Maker je volně šiřitelný software; můžete ho předat dál nebo\n" - "upravit podle podmínek GNU licence (Genral Public Licence), která\n" -@@ -449,8 +449,8 @@ msgstr "" - "\n" - "\n" - "Měli by jste obdržet kopii GNU licence s tímto programem; pokud\n" --"tomu tak není napište organizaci Free Software Foundation:\n" --"Inc., 59 Temple Place - Suite 330, Boston MA, 02111-1307, USA" -+"tomu tak není napište organizaci Free Software Foundation,\n" -+"Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." - - #: ../src/dialog.c:1505 - msgid "Legal" -diff --git a/po/da.po b/po/da.po -index 3f5fea7..ce99464 100644 ---- a/po/da.po -+++ b/po/da.po -@@ -508,8 +508,8 @@ msgid "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - msgstr "" - - #: ../src/dialog.c:1590 -diff --git a/po/de.po b/po/de.po -index 1267d80..3734830 100644 ---- a/po/de.po -+++ b/po/de.po -@@ -449,8 +449,8 @@ msgid "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - msgstr "" - - #: ../src/dialog.c:1415 -diff --git a/po/es.po b/po/es.po -index 2a7c68f..cc0a50e 100644 ---- a/po/es.po -+++ b/po/es.po -@@ -453,8 +453,8 @@ msgid "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n" --"02110-1301 USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - msgstr "" - " Window Maker es software libre; puede redistribuirlo y/o\n" - "modificarlo bajo los términos de la Licencia Pública General de GNU\n" -@@ -469,8 +469,8 @@ msgstr "" - "\n" - " Debería haber recibido una copia de la Licencia Pública General de\n" - "GNU junto con este programa. Si no es así, escriba a Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, Estados Unidos de América." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, Estados Unidos de América." - - #: ../src/dialog.c:1389 - msgid "Legal" -diff --git a/po/et.po b/po/et.po -index 11ef15e..6870721 100644 ---- a/po/et.po -+++ b/po/et.po -@@ -482,8 +482,8 @@ msgid "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - msgstr "" - " Window Maker on vaba tarkvara. Te võite seda edasi\n" - "levitada ja/või muuta vastavalt GNU Üldise Avaliku Litsentsi\n" -@@ -498,8 +498,8 @@ msgstr "" - "\n" - "Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia\n" - "koos selle programmiga, kui ei, siis kontakteeruge Free\n" --"Software Foundation'iga, 59 Temple Place - Suite 330,\n" --"Boston, MA 02111-1307, USA." -+"Software Foundation'iga, 51 Franklin St, Fifth Floor,\n" -+"Boston, MA 02110-1301, USA." - - #: ../src/dialog.c:1564 - msgid "Legal" -diff --git a/po/fi.po b/po/fi.po -index 5ff7eea..c439873 100644 ---- a/po/fi.po -+++ b/po/fi.po -@@ -421,8 +421,8 @@ msgid "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - msgstr "" - " Window Maker on vapaa ohjelmisto; voit jakaa sitä edelleen ja/tai\n" - "muokata sitä Free Software Foundationin julkaiseman GNU General Public\n" -@@ -439,8 +439,8 @@ msgstr "" - "\n" - " Tämän ohjelman mukana pitäisi tulla kopio GNU General Public\n" - "Licensestä. Jos näin ei ole, ilmoita siitä osoitteeseen Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - - #: ../src/dialog.c:1507 - msgid "Legal" -diff --git a/po/fr.po b/po/fr.po -index 3b73cd6..dac859f 100644 ---- a/po/fr.po -+++ b/po/fr.po -@@ -432,8 +432,8 @@ msgid "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - msgstr "" - " Window Maker est un logiciel libre ; il peut être redistribué\n" - "et/ou modifié selon les termes de la Licence Publique Générale du\n" -@@ -448,8 +448,8 @@ msgstr "" - "\n" - " Vous devriez avoir reçu une copie de la Licence Publique\n" - "Générale avec ce programme ; dans le cas contraire, écrivez à la\n" --"Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n" --"Boston, MA 02111-1307, USA." -+"Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,\n" -+"Boston, MA 02110-1301, USA." - - #: ../src/dialog.c:1547 - msgid "Legal" -diff --git a/po/hy.po b/po/hy.po -index 4800a04..fdad0a9 100644 ---- a/po/hy.po -+++ b/po/hy.po -@@ -548,8 +548,8 @@ msgid "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - msgstr "" - " Window Maker-ը ազատ ծրագիր է; դուք կարող եք փոփոխել և/կամ\n" - "տարածել այն ըստ Ազատ Ծրարգերի Հիմնադրամի (Free Software Foundation)\n" -@@ -563,8 +563,8 @@ msgstr "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - - #: ../src/dialog.c:1564 - msgid "Legal" -diff --git a/po/it.po b/po/it.po -index 75c47cb..68b9af5 100644 ---- a/po/it.po -+++ b/po/it.po -@@ -482,8 +482,8 @@ msgid "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - msgstr "" - " Window Maker è software libero; può essere ridistribuito e/o modificato\n" - "nei termini della GNU General Public License come pubblicata dalla Free\n" -@@ -497,7 +497,7 @@ msgstr "" - "\n" - " Dovreste aver ricevuto una copia della GNU General Public License\n" - "insieme a questo programma; se non è così, scrivete alla Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." - - #: ../src/dialog.c:1563 - msgid "Legal" -diff --git a/po/ms.po b/po/ms.po -index 6a0bce5..4e623ec 100644 ---- a/po/ms.po -+++ b/po/ms.po -@@ -427,8 +427,8 @@ msgid "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - msgstr "" - - #: ../src/dialog.c:1586 -diff --git a/po/ru.po b/po/ru.po -index eee8383..53fc543 100644 ---- a/po/ru.po -+++ b/po/ru.po -@@ -453,8 +453,8 @@ msgid "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - msgstr "" - - #: ../src/dialog.c:1621 -diff --git a/po/sk.po b/po/sk.po -index 8df10f8..dfd3ce8 100644 ---- a/po/sk.po -+++ b/po/sk.po -@@ -451,8 +451,8 @@ msgid "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - msgstr "" - " Tento program je free software; môžete ho rozširovať a/alebo \n" - "modifikovať v súlade s GNU General Public License, ktorú publikuje\n" -@@ -468,7 +468,7 @@ msgstr "" - "\n" - "Kópiu GNU General Public License by ste mali obdržať \n" - "spolu s týmto programom; ak nie, píšte na Free Software Foundation,\n" --" Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n" -+" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,\n" - "USA." - - #: ../src/dialog.c:1551 -diff --git a/po/zh_TW.po b/po/zh_TW.po -index 49d89a2..93181fe 100644 ---- a/po/zh_TW.po -+++ b/po/zh_TW.po -@@ -481,8 +481,8 @@ msgid "" - "\n" - " You should have received a copy of the GNU General Public\n" - "License along with this program; if not, write to the Free Software\n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" --"02111-1307, USA." -+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" -+"02110-1301, USA." - msgstr "" - - #: ../src/dialog.c:1563 -diff --git a/src/wconfig.h.in b/src/wconfig.h.in -index f4acba8..c21638d 100644 ---- a/src/wconfig.h.in -+++ b/src/wconfig.h.in -@@ -17,7 +17,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #ifndef WMCONFIG_H_ -diff --git a/src/xutil.c b/src/xutil.c -index dd52afc..fc3ebd1 100644 ---- a/src/xutil.c -+++ b/src/xutil.c -@@ -15,7 +15,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/util/wxcopy.c b/util/wxcopy.c -index d716e81..60e790d 100644 ---- a/util/wxcopy.c -+++ b/util/wxcopy.c -@@ -14,7 +14,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/util/wxpaste.c b/util/wxpaste.c -index 87fc892..bb8fe51 100644 ---- a/util/wxpaste.c -+++ b/util/wxpaste.c -@@ -14,7 +14,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include "../config.h" -diff --git a/wmlib/WMaker.h b/wmlib/WMaker.h -index 23def87..724b326 100644 ---- a/wmlib/WMaker.h -+++ b/wmlib/WMaker.h -@@ -15,7 +15,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #ifndef _WMLIB_H_ -diff --git a/wmlib/app.c b/wmlib/app.c -index 2389df3..9cd27c8 100644 ---- a/wmlib/app.c -+++ b/wmlib/app.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wmlib/app.h b/wmlib/app.h -index 3f38f1f..4cac95c 100644 ---- a/wmlib/app.h -+++ b/wmlib/app.h -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #ifndef _APP_H_ -diff --git a/wmlib/command.c b/wmlib/command.c -index 8c643d9..70ec0f5 100644 ---- a/wmlib/command.c -+++ b/wmlib/command.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wmlib/event.c b/wmlib/event.c -index 6caeb75..ceb5ae9 100644 ---- a/wmlib/event.c -+++ b/wmlib/event.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wmlib/menu.c b/wmlib/menu.c -index 46f6de1..0378427 100644 ---- a/wmlib/menu.c -+++ b/wmlib/menu.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wmlib/menu.h b/wmlib/menu.h -index 9163eac..a611a1a 100644 ---- a/wmlib/menu.h -+++ b/wmlib/menu.h -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #ifndef _MENU_H_ -diff --git a/wrlib/alpha_combine.c b/wrlib/alpha_combine.c -index e670d62..b410186 100644 ---- a/wrlib/alpha_combine.c -+++ b/wrlib/alpha_combine.c -@@ -14,7 +14,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include "wraster.h" -diff --git a/wrlib/color.c b/wrlib/color.c -index 75140f9..c0c7719 100644 ---- a/wrlib/color.c -+++ b/wrlib/color.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/context.c b/wrlib/context.c -index 0fe956c..6a4f04e 100644 ---- a/wrlib/context.c -+++ b/wrlib/context.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/convert.c b/wrlib/convert.c -index a05e363..2b0d415 100644 ---- a/wrlib/convert.c -+++ b/wrlib/convert.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - /* Problems: -diff --git a/wrlib/convolve.c b/wrlib/convolve.c -index 270fa7c..57072f0 100644 ---- a/wrlib/convolve.c -+++ b/wrlib/convolve.c -@@ -15,7 +15,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/draw.c b/wrlib/draw.c -index 071f016..7f54c7a 100644 ---- a/wrlib/draw.c -+++ b/wrlib/draw.c -@@ -17,7 +17,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/gif.c b/wrlib/gif.c -index 29068ad..081f1ee 100644 ---- a/wrlib/gif.c -+++ b/wrlib/gif.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/gradient.c b/wrlib/gradient.c -index 383ecf8..718f879 100644 ---- a/wrlib/gradient.c -+++ b/wrlib/gradient.c -@@ -17,7 +17,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/jpeg.c b/wrlib/jpeg.c -index 22a8767..68f4e02 100644 ---- a/wrlib/jpeg.c -+++ b/wrlib/jpeg.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/load.c b/wrlib/load.c -index d636250..d3ae8ad 100644 ---- a/wrlib/load.c -+++ b/wrlib/load.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/misc.c b/wrlib/misc.c -index 7117d81..bbebee3 100644 ---- a/wrlib/misc.c -+++ b/wrlib/misc.c -@@ -15,7 +15,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - #include - -diff --git a/wrlib/nxpm.c b/wrlib/nxpm.c -index 706d241..45ace0d 100644 ---- a/wrlib/nxpm.c -+++ b/wrlib/nxpm.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/png.c b/wrlib/png.c -index 5cb9918..e28d730 100644 ---- a/wrlib/png.c -+++ b/wrlib/png.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/ppm.c b/wrlib/ppm.c -index d89d917..e4bd758 100644 ---- a/wrlib/ppm.c -+++ b/wrlib/ppm.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/raster.c b/wrlib/raster.c -index f01db84..fbc73a7 100644 ---- a/wrlib/raster.c -+++ b/wrlib/raster.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/rotate.c b/wrlib/rotate.c -index 472c51a..b1379ba 100644 ---- a/wrlib/rotate.c -+++ b/wrlib/rotate.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/save.c b/wrlib/save.c -index 7ae379a..1c8b78b 100644 ---- a/wrlib/save.c -+++ b/wrlib/save.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/scale.c b/wrlib/scale.c -index c5b5caf..6990afe 100644 ---- a/wrlib/scale.c -+++ b/wrlib/scale.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/tiff.c b/wrlib/tiff.c -index 56f0636..accdfbe 100644 ---- a/wrlib/tiff.c -+++ b/wrlib/tiff.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/wraster.h b/wrlib/wraster.h -index b55af32..40f031b 100644 ---- a/wrlib/wraster.h -+++ b/wrlib/wraster.h -@@ -15,7 +15,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - /* -diff --git a/wrlib/xpixmap.c b/wrlib/xpixmap.c -index 219ac62..14bed08 100644 ---- a/wrlib/xpixmap.c -+++ b/wrlib/xpixmap.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/xpm.c b/wrlib/xpm.c -index 9237689..5ce1ea1 100644 ---- a/wrlib/xpm.c -+++ b/wrlib/xpm.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include -diff --git a/wrlib/xutil.c b/wrlib/xutil.c -index 0588ae3..6d0b242 100644 ---- a/wrlib/xutil.c -+++ b/wrlib/xutil.c -@@ -16,7 +16,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free -- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include --- -1.8.1 - diff --git a/0001-Fix-underlinking.patch b/0001-Fix-underlinking.patch deleted file mode 100644 index 524b61d..0000000 --- a/0001-Fix-underlinking.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 37677b2ec08c514e2234400244d15b989c4b8faf Mon Sep 17 00:00:00 2001 -From: Kamil Rytarowski -Date: Sat, 5 Jan 2013 12:17:41 +0100 -Subject: [PATCH] Fix underlinking - -libWMaker (wmlib) requires -lX11. ---- - wmlib/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/wmlib/Makefile.am b/wmlib/Makefile.am -index 3a5ff27..c6432b6 100644 ---- a/wmlib/Makefile.am -+++ b/wmlib/Makefile.am -@@ -8,6 +8,8 @@ include_HEADERS = WMaker.h - - AM_CPPFLAGS = $(DFLAGS) @XCFLAGS@ - -+libWMaker_la_LIBADD = -lX11 -+ - libWMaker_la_SOURCES = \ - menu.c \ - app.c \ --- -1.8.1 - diff --git a/0001-WINGS-New-function-WMReadPropListFromPipe.patch b/0001-WINGS-New-function-WMReadPropListFromPipe.patch deleted file mode 100644 index 1039631..0000000 --- a/0001-WINGS-New-function-WMReadPropListFromPipe.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 9d33224c1294f6d0dd80d3f24b290d406af7711f Mon Sep 17 00:00:00 2001 -From: Andreas Bierfert -Date: Sun, 10 Feb 2013 10:39:27 +0100 -Subject: [PATCH 1/3] WINGS: New function WMReadPropListFromPipe - -This functions reads a proplist from a pipe instead of a file (like -WMReadPropListFromFile does). It uses a call to popen to open the desired -command, reads data into a buffer till EOF and passes the data to getPropList -for parsing. - -v2: code cleanup ---- - WINGs/WINGs/WUtil.h | 2 ++ - WINGs/proplist.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 56 insertions(+) - -diff --git a/WINGs/WINGs/WUtil.h b/WINGs/WINGs/WUtil.h -index 30476e0..84f60b9 100644 ---- a/WINGs/WINGs/WUtil.h -+++ b/WINGs/WINGs/WUtil.h -@@ -807,6 +807,8 @@ char* WMGetPropListDescription(WMPropList *plist, Bool indented); - - WMPropList* WMReadPropListFromFile(char *file); - -+WMPropList* WMReadPropListFromPipe(char *command); -+ - Bool WMWritePropListToFile(WMPropList *plist, char *path); - - /* ---[ WINGs/userdefaults.c ]-------------------------------------------- */ -diff --git a/WINGs/proplist.c b/WINGs/proplist.c -index 7b0f49d..7a80f50 100644 ---- a/WINGs/proplist.c -+++ b/WINGs/proplist.c -@@ -1545,6 +1545,60 @@ WMPropList *WMReadPropListFromFile(char *file) - return plist; - } - -+WMPropList *WMReadPropListFromPipe(char *command) -+{ -+ FILE *file; -+ WMPropList *plist; -+ PLData *pldata; -+ char line[1024]; -+ -+ file = popen(command, "r"); -+ -+ if (!file) { -+ werror(_("%s:could not open menu file"), command); -+ return NULL; -+ } -+ -+ pldata = (PLData *) wmalloc(sizeof(PLData)); -+ pldata->ptr = NULL; -+ pldata->filename = command; -+ pldata->lineNumber = 1; -+ -+ /* read from file till EOF or OOM and fill proplist buffer*/ -+ while (fgets(line, sizeof(line), file) != NULL) { -+ if (pldata->ptr == NULL) { -+ pldata->ptr = wmalloc(strlen(line)+1); -+ pldata->ptr[0] = '\0'; -+ } else { -+ pldata->ptr = wrealloc(pldata->ptr, -+ strlen(line) + strlen(pldata->ptr) + 1); -+ } -+ -+ pldata->ptr = strncat(pldata->ptr, line, strlen(line)); -+ } -+ -+ pclose(file); -+ -+ plist = getPropList(pldata); -+ -+ if (getNonSpaceChar(pldata) != 0 && plist) { -+ COMPLAIN(pldata, _("extra data after end of property list")); -+ /* -+ * We can't just ignore garbage after the end of the description -+ * (especially if the description was read from a file), because -+ * the "garbage" can be the real data and the real garbage is in -+ * fact in the beginning of the file (which is now inside plist) -+ */ -+ WMReleasePropList(plist); -+ plist = NULL; -+ } -+ -+ wfree(pldata->ptr); -+ wfree(pldata); -+ -+ return plist; -+} -+ - /* TODO: review this function's code */ - - Bool WMWritePropListToFile(WMPropList * plist, char *path) --- -1.8.1.2 - diff --git a/0002-Add-OPEN_PLMENU-option-to-parse-command-generated-pr.patch b/0002-Add-OPEN_PLMENU-option-to-parse-command-generated-pr.patch deleted file mode 100644 index 1231506..0000000 --- a/0002-Add-OPEN_PLMENU-option-to-parse-command-generated-pr.patch +++ /dev/null @@ -1,171 +0,0 @@ -From 4d68d6808190bc591806833fd122522c62039117 Mon Sep 17 00:00:00 2001 -From: Andreas Bierfert -Date: Sun, 10 Feb 2013 10:51:02 +0100 -Subject: [PATCH 2/3] Add OPEN_PLMENU option to parse command generated - proplist style menus - -This patch adds the OPEN_PLMENU options which behaves similar to OPEN_MENU but -can be used to parse command generated proplists. This can be used e.g. in -conjunction with wmmenugen like: -( - "Generated PL Submenu", - OPEN_PLMENU, - "|| find /usr/share/applications -type f -name '*desktop' | xargs -wmmenugen -parser:xdg" -) - -v2: code cleanup ---- - src/rootmenu.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 101 insertions(+) - -diff --git a/src/rootmenu.c b/src/rootmenu.c -index 2fcd0ae..ed5a865 100644 ---- a/src/rootmenu.c -+++ b/src/rootmenu.c -@@ -62,6 +62,7 @@ extern Cursor wCursor[WCUR_LAST]; - extern WPreferences wPreferences; - - static WMenu *readMenuPipe(WScreen * scr, char **file_name); -+static WMenu *readPLMenuPipe(WScreen * scr, char **file_name); - static WMenu *readMenuFile(WScreen * scr, char *file_name); - static WMenu *readMenuDirectory(WScreen * scr, char *title, char **file_name, char *command); - static WMenu *configureMenu(WScreen * scr, WMPropList * definition, Bool includeGlobals); -@@ -118,6 +119,12 @@ static Shortcut *shortcutList = NULL; - * command must be a valid menu description. - * The space between '|' and command is optional. - * || will do the same, but will not cache the contents. -+ * OPEN_PLMENU | command -+ * - opens command and uses its stdout which must be in proplist -+ * fromat to construct and insert the resulting menu in current -+ * position. -+ * The space between '|' and command is optional. -+ * || will do the same, but will not cache the contents. - * SAVE_SESSION - saves the current state of the desktop, which include - * all running applications, all their hints (geometry, - * position on screen, workspace they live on, the dock -@@ -573,6 +580,8 @@ static WMenu *constructPLMenu(WScreen *screen, char *path) - return menu; - } - -+ -+ - static void constructMenu(WMenu * menu, WMenuEntry * entry) - { - WMenu *submenu; -@@ -695,6 +704,53 @@ static void constructMenu(WMenu * menu, WMenuEntry * entry) - wfree(cmd); - } - -+static void constructPLMenuFromPipe(WMenu * menu, WMenuEntry * entry) -+{ -+ WMenu *submenu = NULL; -+ char **path; -+ char *cmd; -+ int i; -+ -+ separateCommand((char *)entry->clientdata, &path, &cmd); -+ if (path == NULL || *path == NULL || **path == 0) { -+ wwarning(_("invalid OPEN_PLMENU specification: %s"), -+ (char *)entry->clientdata); -+ if (cmd) -+ wfree(cmd); -+ return; -+ } -+ -+ if (path[0][0] == '|') { -+ /* pipe menu */ -+ -+ if (!menu->cascades[entry->cascade] -+ || menu->cascades[entry->cascade]->timestamp == 0) { -+ /* parse pipe */ -+ submenu = readPLMenuPipe(menu->frame->screen_ptr, path); -+ -+ if (submenu != NULL) { -+ if (path[0][1] == '|') -+ submenu->timestamp = 0; -+ else -+ submenu->timestamp = 1; /* there's no automatic reloading */ -+ } -+ } -+ } -+ -+ if (submenu) { -+ wMenuEntryRemoveCascade(menu, entry); -+ wMenuEntrySetCascade(menu, entry, submenu); -+ } -+ -+ i = 0; -+ while (path[i] != NULL) -+ wfree(path[i++]); -+ -+ wfree(path); -+ if (cmd) -+ wfree(cmd); -+ -+} - static void cleanupWorkspaceMenu(WMenu * menu) - { - if (menu->frame->screen_ptr->workspace_menu == menu) -@@ -786,6 +842,23 @@ static WMenuEntry *addMenuEntry(WMenu * menu, char *title, char *shortcut, char - entry->free_cdata = wfree; - wMenuEntrySetCascade(menu, entry, dummy); - } -+ } else if (strcmp(command, "OPEN_PLMENU") == 0) { -+ if (!params) { -+ wwarning(_("%s:missing parameter for menu command \"%s\""), file_name, command); -+ } else { -+ WMenu *dummy; -+ char *path; -+ -+ path = wfindfile(DEF_CONFIG_PATHS, params); -+ if (!path) -+ path = wstrdup(params); -+ -+ dummy = wMenuCreate(scr, title, False); -+ dummy->on_destroy = removeShortcutsForMenu; -+ entry = wMenuAddCallback(menu, title, constructPLMenuFromPipe, path); -+ entry->free_cdata = wfree; -+ wMenuEntrySetCascade(menu, entry, dummy); -+ } - } else if (strcmp(command, "EXEC") == 0) { - if (!params) - wwarning(_("%s:missing parameter for menu command \"%s\""), file_name, command); -@@ -979,6 +1052,34 @@ static WMenu *readMenuFile(WScreen * scr, char *file_name) - } - - /************ Menu Configuration From Pipe *************/ -+static WMenu *readPLMenuPipe(WScreen * scr, char **file_name) -+{ -+ WMPropList *plist = NULL; -+ WMenu *menu = NULL; -+ char *filename; -+ char flat_file[MAXLINE]; -+ int i; -+ -+ flat_file[0] = '\0'; -+ -+ for (i = 0; file_name[i] != NULL; i++) { -+ strcat(flat_file, file_name[i]); -+ strcat(flat_file, " "); -+ } -+ filename = flat_file + (flat_file[1] == '|' ? 2 : 1); -+ -+ plist = WMReadPropListFromPipe(filename); -+ -+ if (!plist) -+ return NULL; -+ -+ menu = configureMenu(scr, plist, False); -+ if (!menu) -+ return NULL; -+ -+ menu->on_destroy = removeShortcutsForMenu; -+ return menu; -+} - - static WMenu *readMenuPipe(WScreen * scr, char **file_name) - { --- -1.8.1.2 - diff --git a/0002-Include-LGPL-with-correct-FSF-address.patch b/0002-Include-LGPL-with-correct-FSF-address.patch deleted file mode 100644 index f882666..0000000 --- a/0002-Include-LGPL-with-correct-FSF-address.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 930ac143a80aa585e33ec17c03ea231a50041bf4 Mon Sep 17 00:00:00 2001 -From: Andreas Bierfert -Date: Mon, 7 Jan 2013 21:33:47 +0100 -Subject: [PATCH 2/2] Include LGPL with correct FSF address - -(see http://www.gnu.org/licenses/old-licenses/lgpl-2.0.txt) ---- - wmlib/COPYING.LIB | 20 ++++++++++---------- - wrlib/COPYING | 20 ++++++++++---------- - 2 files changed, 20 insertions(+), 20 deletions(-) - -diff --git a/wmlib/COPYING.LIB b/wmlib/COPYING.LIB -index eb685a5..5bc8fb2 100644 ---- a/wmlib/COPYING.LIB -+++ b/wmlib/COPYING.LIB -@@ -1,15 +1,15 @@ -- GNU LIBRARY GENERAL PUBLIC LICENSE -- Version 2, June 1991 -+ GNU LIBRARY GENERAL PUBLIC LICENSE -+ Version 2, June 1991 - - Copyright (C) 1991 Free Software Foundation, Inc. -- 675 Mass Ave, Cambridge, MA 02139, USA -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - [This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - -- Preamble -+ Preamble - - The licenses for most software are designed to take away your - freedom to share and change it. By contrast, the GNU General Public -@@ -99,7 +99,7 @@ works together with the library. - Note that it is possible for a library to be covered by the ordinary - General Public License rather than by this special one. - -- GNU LIBRARY GENERAL PUBLIC LICENSE -+ GNU LIBRARY GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which -@@ -411,7 +411,7 @@ decision will be guided by the two goals of preserving the free status - of all derivatives of our free software and of promoting the sharing - and reuse of software generally. - -- NO WARRANTY -+ NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -@@ -434,9 +434,9 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF - SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - DAMAGES. - -- END OF TERMS AND CONDITIONS -+ END OF TERMS AND CONDITIONS - -- Appendix: How to Apply These Terms to Your New Libraries -+ How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest - possible use to the public, we recommend making it free software that -@@ -463,8 +463,8 @@ convey the exclusion of warranty; and each file should have at least the - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public -- License along with this library; if not, write to the Free -- Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ License along with this library; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - Also add information on how to contact you by electronic and paper mail. - -diff --git a/wrlib/COPYING b/wrlib/COPYING -index eb685a5..5bc8fb2 100644 ---- a/wrlib/COPYING -+++ b/wrlib/COPYING -@@ -1,15 +1,15 @@ -- GNU LIBRARY GENERAL PUBLIC LICENSE -- Version 2, June 1991 -+ GNU LIBRARY GENERAL PUBLIC LICENSE -+ Version 2, June 1991 - - Copyright (C) 1991 Free Software Foundation, Inc. -- 675 Mass Ave, Cambridge, MA 02139, USA -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - [This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - -- Preamble -+ Preamble - - The licenses for most software are designed to take away your - freedom to share and change it. By contrast, the GNU General Public -@@ -99,7 +99,7 @@ works together with the library. - Note that it is possible for a library to be covered by the ordinary - General Public License rather than by this special one. - -- GNU LIBRARY GENERAL PUBLIC LICENSE -+ GNU LIBRARY GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which -@@ -411,7 +411,7 @@ decision will be guided by the two goals of preserving the free status - of all derivatives of our free software and of promoting the sharing - and reuse of software generally. - -- NO WARRANTY -+ NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -@@ -434,9 +434,9 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF - SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - DAMAGES. - -- END OF TERMS AND CONDITIONS -+ END OF TERMS AND CONDITIONS - -- Appendix: How to Apply These Terms to Your New Libraries -+ How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest - possible use to the public, we recommend making it free software that -@@ -463,8 +463,8 @@ convey the exclusion of warranty; and each file should have at least the - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public -- License along with this library; if not, write to the Free -- Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ License along with this library; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - Also add information on how to contact you by electronic and paper mail. - --- -1.8.1 - diff --git a/0003-Teach-WPrefs-about-OPEN_PLMENU.patch b/0003-Teach-WPrefs-about-OPEN_PLMENU.patch deleted file mode 100644 index 1d81f71..0000000 --- a/0003-Teach-WPrefs-about-OPEN_PLMENU.patch +++ /dev/null @@ -1,210 +0,0 @@ -From ee644287c5943a3d7fb9f5404815ecb81fc66459 Mon Sep 17 00:00:00 2001 -From: Andreas Bierfert -Date: Sun, 10 Feb 2013 10:54:59 +0100 -Subject: [PATCH 3/3] Teach WPrefs about OPEN_PLMENU - -Add option to WPrefs to read, add and edit OPEN_PLMENU menu entries ---- - WPrefs.app/Menu.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 85 insertions(+), 1 deletion(-) - -diff --git a/WPrefs.app/Menu.c b/WPrefs.app/Menu.c -index 4a8cc94..3edb84a 100644 ---- a/WPrefs.app/Menu.c -+++ b/WPrefs.app/Menu.c -@@ -34,6 +34,7 @@ typedef enum { - CommandInfo, - ExternalInfo, - PipeInfo, -+ PLPipeInfo, - DirectoryInfo, - WSMenuInfo, - WWindowListInfo, -@@ -82,6 +83,10 @@ typedef struct _Panel { - WMTextField *pipeT; - WMButton *pipeCacheB; - -+ WMFrame *plpipeF; -+ WMTextField *plpipeT; -+ WMButton *plpipeCacheB; -+ - WMFrame *dpathF; - WMTextField *dpathT; - -@@ -391,6 +396,7 @@ static void createPanel(_Panel * p) - - panel->markerPix[ExternalInfo] = pixm; - panel->markerPix[PipeInfo] = pixm; -+ panel->markerPix[PLPipeInfo] = pixm; - panel->markerPix[DirectoryInfo] = pixm; - panel->markerPix[WSMenuInfo] = pixm; - panel->markerPix[WWindowListInfo] = pixm; -@@ -424,6 +430,7 @@ static void createPanel(_Panel * p) - putNewSubmenu(pad, _("Submenu")); - putNewItem(panel, pad, ExternalInfo, _("External Submenu")); - putNewItem(panel, pad, PipeInfo, _("Generated Submenu")); -+ putNewItem(panel, pad, PLPipeInfo, _("Generated PL Menu")); - putNewItem(panel, pad, DirectoryInfo, _("Directory Contents")); - putNewItem(panel, pad, WSMenuInfo, _("Workspace Menu")); - putNewItem(panel, pad, WWindowListInfo, _("Window List Menu")); -@@ -642,6 +649,31 @@ static void createPanel(_Panel * p) - - WMMapSubwidgets(panel->pipeF); - -+ /* proplist pipe */ -+ -+ panel->plpipeF = WMCreateFrame(panel->optionsF); -+ WMResizeWidget(panel->plpipeF, width, 155); -+ WMMoveWidget(panel->plpipeF, 10, 30); -+ WMSetFrameTitle(panel->plpipeF, _("Command")); -+ -+ panel->plpipeT = WMCreateTextField(panel->plpipeF); -+ WMResizeWidget(panel->plpipeT, width - 20, 20); -+ WMMoveWidget(panel->plpipeT, 10, 20); -+ -+ WMAddNotificationObserver(dataChanged, panel, WMTextDidChangeNotification, panel->plpipeT); -+ -+ label = WMCreateLabel(panel->plpipeF); -+ WMResizeWidget(label, width - 20, 40); -+ WMMoveWidget(label, 10, 50); -+ WMSetLabelText(label, _("Enter a command that outputs a proplist menu\n" "definition to stdout when invoked.")); -+ -+ panel->plpipeCacheB = WMCreateSwitchButton(panel->plpipeF); -+ WMResizeWidget(panel->plpipeCacheB, width - 20, 40); -+ WMMoveWidget(panel->plpipeCacheB, 10, 110); -+ WMSetButtonText(panel->plpipeCacheB, _("Cache menu contents after opening for\n" "the first time")); -+ -+ WMMapSubwidgets(panel->plpipeF); -+ - /* directory menu */ - - panel->dcommandF = WMCreateFrame(panel->optionsF); -@@ -790,6 +822,8 @@ static void createPanel(_Panel * p) - - panel->sections[PipeInfo][0] = panel->pipeF; - -+ panel->sections[PLPipeInfo][0] = panel->plpipeF; -+ - panel->sections[DirectoryInfo][0] = panel->dpathF; - panel->sections[DirectoryInfo][1] = panel->dcommandF; - -@@ -835,6 +869,10 @@ static void freeItemData(ItemData * data) - CFREE(data->param.pipe.command); - break; - -+ case PLPipeInfo: -+ CFREE(data->param.pipe.command); -+ break; -+ - case ExternalInfo: - CFREE(data->param.external.path); - break; -@@ -941,6 +979,22 @@ static ItemData *parseCommand(WMPropList * item) - data->param.external.path = p; - } - } -+ } else if (strcmp(command, "OPEN_PLMENU") == 0) { -+ char *p; -+ -+ p = parameter; -+ while (isspace(*p) && *p) -+ p++; -+ if (*p == '|') { -+ if (*(p + 1) == '|') { -+ p++; -+ data->param.pipe.cached = 0; -+ } else { -+ data->param.pipe.cached = 1; -+ } -+ data->type = PLPipeInfo; -+ data->param.pipe.command = wtrimspace(p + 1); -+ } - } else if (strcmp(command, "WORKSPACE_MENU") == 0) { - data->type = WSMenuInfo; - } else if (strcmp(command, "WINDOWS_MENU") == 0) { -@@ -1014,6 +1068,10 @@ static void updateFrameTitle(_Panel * panel, char *title, InfoType type) - tmp = wstrconcat(title, _(": Program Generated Submenu")); - break; - -+ case PLPipeInfo: -+ tmp = wstrconcat(title, _(": Program Generated Proplist Submenu")); -+ break; -+ - case DirectoryInfo: - tmp = wstrconcat(title, _(": Directory Contents Menu")); - break; -@@ -1117,6 +1175,15 @@ static void updateMenuItem(_Panel * panel, WEditMenuItem * item, WMWidget * chan - } - break; - -+ case PLPipeInfo: -+ if (changedWidget == panel->plpipeT) { -+ REPLACE(data->param.pipe.command, WMGetTextFieldText(panel->plpipeT)); -+ } -+ if (changedWidget == panel->plpipeCacheB) { -+ data->param.pipe.cached = WMGetButtonSelected(panel->plpipeCacheB); -+ } -+ break; -+ - case ExternalInfo: - if (changedWidget == panel->pathT) { - REPLACE(data->param.external.path, WMGetTextFieldText(panel->pathT)); -@@ -1175,6 +1242,11 @@ menuItemCloned(WEditMenuDelegate * delegate, WEditMenu * menu, WEditMenuItem * o - newData->param.pipe.cached = data->param.pipe.cached; - break; - -+ case PLPipeInfo: -+ newData->param.pipe.command = DUP(data->param.pipe.command); -+ newData->param.pipe.cached = data->param.pipe.cached; -+ break; -+ - case ExternalInfo: - newData->param.external.path = DUP(data->param.external.path); - break; -@@ -1284,6 +1356,11 @@ static void menuItemSelected(WEditMenuDelegate * delegate, WEditMenu * menu, WEd - WMSetButtonSelected(panel->pipeCacheB, data->param.pipe.cached); - break; - -+ case PLPipeInfo: -+ WMSetTextFieldText(panel->plpipeT, data->param.pipe.command); -+ WMSetButtonSelected(panel->plpipeCacheB, data->param.pipe.cached); -+ break; -+ - case ExternalInfo: - WMSetTextFieldText(panel->pathT, data->param.external.path); - break; -@@ -1459,6 +1536,7 @@ static WMPropList *processData(char *title, ItemData * data) - char *s1; - static WMPropList *pscut = NULL; - static WMPropList *pomenu = NULL; -+ static WMPropList *poplmenu = NULL; - int i; - - if (data == NULL) -@@ -1467,6 +1545,7 @@ static WMPropList *processData(char *title, ItemData * data) - if (!pscut) { - pscut = WMCreatePLString("SHORTCUT"); - pomenu = WMCreatePLString("OPEN_MENU"); -+ poplmenu = WMCreatePLString("OPEN_PLMENU"); - } - - item = WMCreatePLArray(WMCreatePLString(title), NULL); -@@ -1522,9 +1601,14 @@ static WMPropList *processData(char *title, ItemData * data) - break; - - case PipeInfo: -+ case PLPipeInfo: - if (!data->param.pipe.command) - return NULL; -- WMAddToPLArray(item, pomenu); -+ if (data->type == PLPipeInfo) -+ WMAddToPLArray(item, poplmenu); -+ else -+ WMAddToPLArray(item, pomenu); -+ - if (data->param.pipe.cached) - s1 = wstrconcat("| ", data->param.pipe.command); - else --- -1.8.1.2 - diff --git a/WindowMaker.spec b/WindowMaker.spec index 706070d..8911225 100644 --- a/WindowMaker.spec +++ b/WindowMaker.spec @@ -1,41 +1,20 @@ Summary: A fast, feature rich Window Manager Name: WindowMaker -Version: 0.95.4 -Release: 6%{?dist} +Version: 0.95.5 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops URL: http://www.windowmaker.org # Source0: http://windowmaker.org/pub/source/release/WindowMaker-%{version}.tar.gz # pull source from git as download folder is still not populated -# http://repo.or.cz/w/wmaker-crm.git/snapshot/a2de2c34eea348aaff5f39434ce297a322672140.tar.gz -Source0: WindowMaker-%{version}.tar.gz +# http://repo.or.cz/w/wmaker-crm.git/snapshot/cd5e004127d4088df21bd62c20a9d6c61a27763b.tar.gz +Source0: wmaker-crm-cd5e004127d4088df21bd62c20a9d6c61a27763b.tar.gz Source1: WindowMaker-xsession.desktop Source2: WindowMaker-application.desktop Source3: WindowMaker-uk.po Source4: WPrefs-uk.po -# fix underlinking of libWMaker -# http://repo.or.cz/w/wmaker-crm.git/patch/37677b2ec08c514e2234400244d15b989c4b8faf?hp=a2de2c34eea348aaff5f39434ce297a322672140 -Patch0: 0001-Fix-underlinking.patch - -# fix incorrect fsf address -# see -# http://repo.or.cz/w/wmaker-crm.git/commit/085224973a3c03c184afd362273f4746c54f5db1 -# and -# http://repo.or.cz/w/wmaker-crm.git/commit/0b74ae41944dbec80e7a26bd02312d4ae6cebff7 -Patch1: 0001-Fix-incorrect-FSF-address.patch -Patch2: 0002-Include-LGPL-with-correct-FSF-address.patch - -# add proplist menu code from git -# see -# http://repo.or.cz/w/wmaker-crm.git/commit/cc69d2aae38b5563d39d3348cec805ed8b3d753d -# http://repo.or.cz/w/wmaker-crm.git/commit/c21ae6b580889d247408123a5c624abf6d784232 -# http://repo.or.cz/w/wmaker-crm.git/commit/066de301df2f07c614b77e7a2bbadd9ff1342e46 -Patch3: 0001-WINGS-New-function-WMReadPropListFromPipe.patch -Patch4: 0002-Add-OPEN_PLMENU-option-to-parse-command-generated-pr.patch -Patch5: 0003-Teach-WPrefs-about-OPEN_PLMENU.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot # X BR BuildRequires: libICE-devel @@ -122,27 +101,23 @@ icons and a few themes. %prep %setup -q -n wmaker-crm -%patch0 -p1 -b .fixunderlinking - -%patch1 -p1 -b .fixfsfaddress -%patch2 -p1 -b .usecurrentlgpl - -%patch3 -p1 -b .wmreadproplistfrompipe -%patch4 -p1 -b .openplmenu -%patch5 -p1 -b .wprefsopenplmenu - # add uk translation cp %{SOURCE3} po/uk.po cp %{SOURCE4} WPrefs.app/po/uk.po # cleanup menu entries -for i in WindowMaker/*menu* ; do +for i in WindowMaker/*menu*; do echo $i sed -i.old -e 's:/usr/local/:%{_prefix}/:g' \ -e 's:/home/mawa:$(HOME):g' \ -e 's:GNUstep/Applications/WPrefs.app:bin:g' $i done +for i in util/wmgenmenu.c WindowMaker/Defaults/WindowMaker.in WPrefs.app/Paths.c; do +echo $i +sed -i.old -e 's:/usr/local/:%{_prefix}/:g' $i +done + autoreconf -vfi -I m4 %build @@ -242,6 +217,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/WindowMaker/Icons/defaultAppIcon.* %{_datadir}/WindowMaker/Icons/defaultterm.* %{_datadir}/WindowMaker/Icons/draw.* +%{_datadir}/WindowMaker/Icons/Drawer.png %{_datadir}/WindowMaker/Icons/Ear.png %{_datadir}/WindowMaker/Icons/Ftp.png %{_datadir}/WindowMaker/Icons/GNUstep3D.* @@ -324,6 +300,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/get-wutil-flags* %changelog +* Sat Aug 31 2013 Andreas Bierfert +- 0.95.5-1 +- version upgrade +- do some more /usr/local/ replacement so that WindowMaker-extra is detected correctly + * Sat Aug 03 2013 Fedora Release Engineering - 0.95.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -492,7 +473,7 @@ rm -rf $RPM_BUILD_ROOT 0.91.0-1 - upgrade to 0.91.0 -* Fri Apr 7 2005 Michael Schwendt +* Fri Apr 7 2005 Michael Schwendt - rebuilt * Fri Nov 28 2003 Dams - 0:0.80.2-0.fdr.6 diff --git a/sources b/sources index 55ff1fa..0c8ea19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -380eb3961c960eb9d8fc10aee20e8ad3 WindowMaker-0.95.4.tar.gz +0af380e1ed526e20fad6529801600a4e wmaker-crm-cd5e004127d4088df21bd62c20a9d6c61a27763b.tar.gz