[Pkg-privacy-commits] [irssi-plugin-otr] 36/267: Moved to new public irssi header statusbar-item.h.
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 12:26:14 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch debian
in repository irssi-plugin-otr.
commit 661b276a13a8818fbc498fbdf68286fe5e664178
Author: Uli Meis <a.sporto+bee at gmail.com>
Date: Mon Jan 19 16:21:53 2009 +0100
Moved to new public irssi header statusbar-item.h.
---
CMakeLists.txt | 36 ++++++++++++++++--------------------
ChangeLog | 1 +
INSTALL | 4 ++--
README.irssi-headers | 3 +++
README.irssi-private-headers | 3 ---
mksrcpackage.sh | 4 ++--
otr.c | 2 +-
otr.h | 3 +--
privheaders.patch | 12 ------------
9 files changed, 26 insertions(+), 42 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e21e29..f9adde4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,8 +118,8 @@ SET(IRSSIOTR_INCLUDE_DIRS
${IRSSI_INCLUDE_DIR}/irssi
${IRSSI_INCLUDE_DIR}/irssi/src
${IRSSI_INCLUDE_DIR}/irssi/src/core
- ${PROJECT_BINARY_DIR}/irssi-private-headers
- ${PROJECT_SOURCE_DIR}/irssi-private-headers)
+ ${PROJECT_BINARY_DIR}/irssi-headers
+ ${PROJECT_SOURCE_DIR}/irssi-headers)
include_directories(${IRSSIOTR_INCLUDE_DIRS})
SET(CMAKE_REQUIRED_INCLUDES ${IRSSIOTR_INCLUDE_DIRS})
@@ -131,32 +131,28 @@ SET(CMAKE_REQUIRED_DEFINITIONS -DHAVE_CONFIG_H ${LIBGCRYPT_CFLAGS})
CHECK_INCLUDE_FILE(glib/gregex.h HAVE_GREGEX_H)
-# irssi private headers
+# irssi headers
-CHECK_INCLUDE_FILES("glib.h;common.h;fe-text/statusbar.h" HAVE_IRSSIPRIV_H)
+CHECK_INCLUDE_FILES("glib.h;common.h;fe-text/statusbar-item.h" HAVE_IRSSISBAR_H)
# Bad hack
-IF (NOT HAVE_IRSSIPRIV_H)
- MESSAGE(STATUS "Need to fetch and patch irssi private headers "
- "mainwindows.h,statusbar.h,term.h from SVN (see irssi FS#535)")
+IF (NOT HAVE_IRSSISBAR_H)
+ MESSAGE(STATUS "Need to fetch irssi header statusbar-item.h (you don't have it yet)")
IF (NOT WGET_EXECUTABLE)
FIND_PACKAGE(Wget REQUIRED)
ENDIF (NOT WGET_EXECUTABLE)
- EXECUTE_PROCESS(COMMAND "mkdir" -p irssi-private-headers/fe-text)
+ EXECUTE_PROCESS(COMMAND "mkdir" -p irssi-headers/fe-text)
EXECUTE_PROCESS(COMMAND "bash" "-c"
- "${WGET_EXECUTABLE} '--post-data=revision=4806&root=irssi' \\
- 'http://svn.irssi.org/cgi-bin/viewvc.cgi/irssi/trunk/src/fe-text/mainwindows.h' \\
- 'http://svn.irssi.org/cgi-bin/viewvc.cgi/irssi/trunk/src/fe-text/term.h' \\
- 'http://svn.irssi.org/cgi-bin/viewvc.cgi/irssi/trunk/src/fe-text/statusbar.h' || exit 1
- patch -p0 mainwindows.h < \"$0/privheaders.patch\" || exit 1"
- ${PROJECT_SOURCE_DIR} WORKING_DIRECTORY irssi-private-headers/fe-text
- RESULT_VARIABLE IIPRIV_RET)
- IF(NOT IIPRIV_RET EQUAL 0)
- MESSAGE(FATAL_ERROR "Couldn't check out irssi private headers from SVN")
- ENDIF(NOT IIPRIV_RET EQUAL 0)
- SET(HAVE_IRSSIPRIV_H 1 CACHE INTERNAL "Having irssi priv headers" FORCE)
-ENDIF (NOT HAVE_IRSSIPRIV_H)
+ "${WGET_EXECUTABLE} '--post-data=revision=4936&root=irssi' \\
+ 'http://svn.irssi.org/cgi-bin/viewvc.cgi/irssi/trunk/src/fe-text/statusbar-item.h' || exit 1"
+ ${PROJECT_SOURCE_DIR} WORKING_DIRECTORY irssi-headers/fe-text
+ RESULT_VARIABLE IISBAR_RET)
+ IF(NOT IISBAR_RET EQUAL 0)
+ MESSAGE(FATAL_ERROR "Couldn't check out irssi headers from SVN")
+ ENDIF(NOT IISBAR_RET EQUAL 0)
+ SET(HAVE_IRSSISBAR_H 1 CACHE INTERNAL "Having irssi headers" FORCE)
+ENDIF (NOT HAVE_IRSSISBAR_H)
# check for strsignal
diff --git a/ChangeLog b/ChangeLog
index 7ecc1ab..63d9d9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Version 0.3
* commands now take an optional nick at server argument
(for single message window users)
* changed loglevel of otr_log (heartbeats) and otr_finish
+ * moved to the new public statusbar-item.h header
Version 0.2
diff --git a/INSTALL b/INSTALL
index 96d5ae1..2cc0bd8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -19,8 +19,8 @@ instead.
nothing smaller will work.
* glib. Will work with < 2.13 but since there are no regexes available
- HTML stripping (OTR spits out HTML sometimes) and nick ignoring won't
- work.
+ HTML stripping (OTR spits out HTML sometimes) and nick ignoring and
+ setting otr_policy won't work.
* irssi. Obviously ;)
diff --git a/README.irssi-headers b/README.irssi-headers
new file mode 100644
index 0000000..2d7c9d7
--- /dev/null
+++ b/README.irssi-headers
@@ -0,0 +1,3 @@
+statusbar-item.h is an irssi header;
+hence it is licensed under the same license as irssi (GPLv2).
+If you want to know why it is here, check out irssi FS#535.
diff --git a/README.irssi-private-headers b/README.irssi-private-headers
deleted file mode 100644
index b3f6335..0000000
--- a/README.irssi-private-headers
+++ /dev/null
@@ -1,3 +0,0 @@
-mainwindows.h, statusbar.h, and term.h are irssi private headers;
-hence they are licensed under the same license as irssi (GPLv2).
-If you want to know why they are here, check out irssi FS#535.
diff --git a/mksrcpackage.sh b/mksrcpackage.sh
index 50e05b1..2080971 100755
--- a/mksrcpackage.sh
+++ b/mksrcpackage.sh
@@ -6,9 +6,9 @@ PKG=irssi-otr-$VER.tar
HDIR=irssi-otr-$VER
mkdir "$HDIR" &&\
(cd "$SDIR" && git archive --format=tar --prefix=irssi-otr-$VER/ HEAD )>$PKG &&\
-(cd "$HDIR" && ln -s ../irssi-private-headers &&\
+(cd "$HDIR" && ln -s ../irssi-headers &&\
echo "SET(IRSSIOTR_VERSION $VER)" >tarballdefs.cmake) &&\
tar rhf $PKG "$HDIR" &&\
-rm $HDIR/{irssi-private-headers,tarballdefs.cmake} &&\
+rm $HDIR/{irssi-headers,tarballdefs.cmake} &&\
rmdir $HDIR &&\
gzip $PKG
diff --git a/otr.c b/otr.c
index 1fc626e..36aab99 100644
--- a/otr.c
+++ b/otr.c
@@ -253,7 +253,7 @@ static void cmd_contexts(const char *data, void *server, WI_ITEM_REC *item)
/*
* otr statusbar
*/
-static void otr_statusbar(SBAR_ITEM_REC *item, int get_size_only)
+static void otr_statusbar(struct SBAR_ITEM_REC *item, int get_size_only)
{
WI_ITEM_REC *wi = active_win->active;
QUERY_REC *query = QUERY(wi);
diff --git a/otr.h b/otr.h
index 0f0bd76..35628b3 100644
--- a/otr.h
+++ b/otr.h
@@ -41,8 +41,7 @@
#include <core/modules.h>
#include <core/settings.h>
-/* copied over, see FS#535 */
-#include <fe-text/statusbar.h>
+#include <fe-text/statusbar-item.h>
/* glib */
diff --git a/privheaders.patch b/privheaders.patch
deleted file mode 100644
index dfc6352..0000000
--- a/privheaders.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mainwindows.h.orig 2008-05-09 21:52:26.000000000 +0200
-+++ mainwindows.h 2008-05-27 12:44:57.000000000 +0200
-@@ -1,8 +1,8 @@
- #ifndef __MAINWINDOWS_H
- #define __MAINWINDOWS_H
-
--#include "fe-windows.h"
--#include "term.h"
-+#include <fe-common/core/fe-windows.h>
-+#include <fe-text/term.h>
-
- #define WINDOW_MIN_SIZE 2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/irssi-plugin-otr.git
More information about the Pkg-privacy-commits
mailing list