From 6703b9513f57d28c078d11ece3cb4abc74b628fc Mon Sep 17 00:00:00 2001 From: Steve Youngs Date: Mon, 27 Jun 2016 16:30:14 +1000 Subject: [PATCH] Build fixes needed for latest Riece pkg. This changeset takes care of a few bits of adimistrivia needed to get the latest Riece to play nice with our packages. Sadly, I've had to hard-code some version strings (see the 3 new files). Riece upstream uses a thing called "gnulib" in a git submodule to automatically set the version. That is a whole world of overkill in my view, hence my decision to hard-code the version. I do apologise for that, but I'm lazy and that was easy. :-) * xemacs-packages/riece/doc/version-en.texi: New. * xemacs-packages/riece/doc/version-ja.texi: New. * xemacs-packages/riece/lisp/riece-package-info.el: New * xemacs-packages/riece/Makefile (AUTHOR_VERSION): Bump to reality. (DONT_COMPILE): New. (ELCS): Use pattern matching and wildcard instead of explicitly listing all files. * xemacs-packages/riece/package-info.in: Update provides. * package-compile.el (package-name-to-directories): Add riece. Signed-off-by: Steve Youngs --- package-compile.el | 1 + xemacs-packages/riece/Makefile | 40 ++++++------------- xemacs-packages/riece/doc/version-en.texi | 4 ++ xemacs-packages/riece/doc/version-ja.texi | 4 ++ .../riece/lisp/riece-package-info.el | 33 +++++++++++++++ xemacs-packages/riece/package-info.in | 2 +- 6 files changed, 56 insertions(+), 28 deletions(-) create mode 100644 xemacs-packages/riece/doc/version-en.texi create mode 100644 xemacs-packages/riece/doc/version-ja.texi create mode 100644 xemacs-packages/riece/lisp/riece-package-info.el diff --git a/package-compile.el b/package-compile.el index c16c3bfb..02cd1382 100644 --- a/package-compile.el +++ b/package-compile.el @@ -235,6 +235,7 @@ (equal package "jde") (equal package "lookup") (equal package "mule-ucs") + (equal package "riece") (equal package "tramp") (equal package "vm") (equal package "w3") diff --git a/xemacs-packages/riece/Makefile b/xemacs-packages/riece/Makefile index 8c3367cc..9715c82a 100644 --- a/xemacs-packages/riece/Makefile +++ b/xemacs-packages/riece/Makefile @@ -20,7 +20,7 @@ # This XEmacs package contains the riece IRC client package VERSION = 1.26 -AUTHOR_VERSION = 3.1.2 +AUTHOR_VERSION = v9.0.0-21-gcf23226 MAINTAINER = Daiki Ueno PACKAGE = riece PKG_TYPE = regular @@ -29,43 +29,29 @@ CATEGORY = standard include ../../Local.rules.inc -ELCS = lisp/riece.elc lisp/riece-000.elc lisp/riece-200.elc \ -lisp/riece-300.elc lisp/riece-400.elc lisp/riece-500.elc \ -lisp/riece-addon-modules.elc lisp/riece-addon.elc lisp/riece-alias.elc \ -lisp/riece-async.elc lisp/riece-biff.elc lisp/riece-button.elc \ -lisp/riece-cache.elc lisp/riece-channel.elc lisp/riece-coding.elc \ -lisp/riece-commands.elc lisp/riece-compat.elc lisp/riece-complete.elc \ -lisp/riece-ctcp.elc lisp/riece-ctlseq.elc lisp/riece-debug.elc \ -lisp/riece-develop.elc lisp/riece-display.elc lisp/riece-doctor.elc \ -lisp/riece-epg.elc lisp/riece-eval-ruby.elc lisp/riece-eval.elc \ -lisp/riece-filter.elc lisp/riece-foolproof.elc lisp/riece-globals.elc \ -lisp/riece-google.elc lisp/riece-guess.elc lisp/riece-handle.elc \ -lisp/riece-hangman.elc lisp/riece-highlight.elc lisp/riece-history.elc \ -lisp/riece-icon.elc lisp/riece-identity.elc lisp/riece-ignore.elc \ -lisp/riece-irc.elc lisp/riece-kakasi.elc lisp/riece-keepalive.elc \ -lisp/riece-keyword.elc lisp/riece-layout.elc lisp/riece-log.elc \ -lisp/riece-lsdb.elc lisp/riece-menu.elc lisp/riece-message.elc \ -lisp/riece-mini.elc lisp/riece-misc.elc lisp/riece-mode.elc \ -lisp/riece-naming.elc lisp/riece-options.elc \ -lisp/riece-package-info.elc lisp/riece-rdcc.elc lisp/riece-ruby.elc \ -lisp/riece-server.elc lisp/riece-shrink-buffer.elc \ -lisp/riece-signal.elc lisp/riece-toolbar.elc lisp/riece-unread.elc \ -lisp/riece-url.elc lisp/riece-user.elc lisp/riece-version.elc \ -lisp/riece-xemacs.elc lisp/riece-xface.elc lisp/riece-xfaceb.elc \ -lisp/riece-yank.elc +DONTCOMPILE = lisp/_pkg.el lisp/auto-autoloads.el lisp/custom-load.el \ + lisp/custom-defines.el lisp/riece-emacs.el lisp/riece-ndcc.el \ + lisp/url-riece.el + +ifeq ($(BUILD_WITHOUT_MULE),t) +DONTCOMPILE += lisp/riece-skk-kakutei.elc lisp/riece-mcat.elc \ + lisp/riece-mcat-japanese.elc +endif + +ELCS = $(patsubst %.el,%.elc,$(filter-out $(DONTCOMPILE),$(wildcard lisp/*.el))) + EXTRA_SOURCES = lisp/riece-emacs.el lisp/riece-ndcc.el \ lisp/riece-skk-kakutei.el lisp/riece-mcat.el \ lisp/riece-mcat-japanese.el lisp/riece-package-info.el.in \ lisp/url-riece.el + AUTOLOAD_PATH = lisp EXPLICIT_DOCS = doc/riece-en.texi ifeq ($(BUILD_WITHOUT_MULE),) COMPILE_INFO_AS_MULE = t EXPLICIT_DOCS += doc/riece-ja.texi -ELCS += lisp/riece-skk-kakutei.elc lisp/riece-mcat.elc \ - lisp/riece-mcat-japanese.elc endif PRELOADS = -eval \("push \"./lisp\" load-path"\) diff --git a/xemacs-packages/riece/doc/version-en.texi b/xemacs-packages/riece/doc/version-en.texi new file mode 100644 index 00000000..66fbe562 --- /dev/null +++ b/xemacs-packages/riece/doc/version-en.texi @@ -0,0 +1,4 @@ +@set UPDATED 1 April 2014 +@set UPDATED-MONTH April 2014 +@set EDITION 9.0.0.21-cf23 +@set VERSION 9.0.0.21-cf23 diff --git a/xemacs-packages/riece/doc/version-ja.texi b/xemacs-packages/riece/doc/version-ja.texi new file mode 100644 index 00000000..66fbe562 --- /dev/null +++ b/xemacs-packages/riece/doc/version-ja.texi @@ -0,0 +1,4 @@ +@set UPDATED 1 April 2014 +@set UPDATED-MONTH April 2014 +@set EDITION 9.0.0.21-cf23 +@set VERSION 9.0.0.21-cf23 diff --git a/xemacs-packages/riece/lisp/riece-package-info.el b/xemacs-packages/riece/lisp/riece-package-info.el new file mode 100644 index 00000000..527fcac1 --- /dev/null +++ b/xemacs-packages/riece/lisp/riece-package-info.el @@ -0,0 +1,33 @@ +;;; riece-package-info.el --- package information about Riece +;; Copyright (C) 2006 Daiki Ueno + +;; Author: Daiki Ueno + +;; This file is part of Riece. + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. + +;;; Code: + +;;(defconst riece-package-name "@PACKAGE@") +(defconst riece-package-name "Riece") + +(defconst riece-version-number "9.0.0.21-cf23" + "Version number for this version of Riece.") + +(provide 'riece-package-info) + +;;; riece-package-info.el ends here diff --git a/xemacs-packages/riece/package-info.in b/xemacs-packages/riece/package-info.in index 60d14959..e2f3c3ec 100644 --- a/xemacs-packages/riece/package-info.in +++ b/xemacs-packages/riece/package-info.in @@ -13,7 +13,7 @@ filename FILENAME md5sum MD5SUM size SIZE - provides (riece-compat riece-xemacs riece-globals riece-options riece-debug riece-version riece-coding riece-complete riece-addon-modules riece-addon riece-ruby riece-cache riece-mode riece-identity riece-channel riece-user riece-misc riece-signal riece-layout riece-display riece-server riece-naming riece-message riece-filter riece-handle riece-000 riece-200 riece-300 riece-400 riece-500 riece-commands riece-irc riece riece-alias riece-async riece-biff riece-button riece-ctcp riece-ctlseq riece-doctor riece-eval-ruby riece-eval riece-foolproof riece-google riece-guess riece-hangman riece-highlight riece-history riece-icon riece-ignore riece-kakasi riece-keepalive riece-keyword riece-log riece-lsdb riece-menu riece-mini riece-rdcc riece-shrink-buffer riece-skk-kakutei riece-toolbar riece-unread riece-url riece-xface riece-xfaceb riece-yank) + provides (riece-000 riece-200 riece-300 riece-400 riece-500 riece-addon-modules riece-addon riece-alias riece-async riece-biff riece-button riece-cache riece-channel riece-coding riece-commands riece-compat riece-complete riece-ctcp riece-ctlseq riece-debug riece-desktop-notify riece-display riece-doctor riece-emacs riece-epg riece-eval-ruby riece-eval riece-filter riece-foolproof riece-globals riece-google riece-guess riece-handle riece-hangman riece-highlight riece-history riece-icon riece-identity riece-ignore riece-irc riece-kakasi riece-keepalive riece-keyword riece-layout riece-log riece-lsdb riece-mcat-japanese riece-mcat riece-menu riece-message riece-mini riece-misc riece-mode riece-naming riece-ndcc riece-options riece-package-info riece-rdcc riece-ruby riece-server riece-shrink-buffer riece-signal riece-skk-kakutei riece-toolbar riece-twitter riece-unread riece-url riece-user riece-version riece-xemacs riece-xface riece-xfaceb riece-yank riece) requires (REQUIRES) type regular )) -- 2.25.1