Changeset 15105


Ignore:
Timestamp:
2009-04-04T18:23:31+02:00 (7 years ago)
Author:
florian
Message:

[package] rename the old irssi to irssi-glib1 and update irssi to 0.8.13

Location:
packages/net
Files:
2 edited
1 copied

Legend:

Unmodified
Added
Removed
  • packages/net/irssi/Makefile

    r14345 r15105  
    1010 
    1111PKG_NAME:=irssi 
    12 PKG_VERSION:=0.8.10 
    13 PKG_RELEASE:=2 
     12PKG_VERSION:=0.8.13 
     13PKG_RELEASE:=1 
    1414 
    15 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)a.tar.bz2 
     15PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1616PKG_SOURCE_URL:=http://irssi.org/files/ 
    17 PKG_MD5SUM:=38e616bccb6a34ff6d91690317c2fa19 
     17PKG_MD5SUM:=0d6fc2203832b514eff014fffd574664 
    1818 
    1919PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
     
    2121include $(INCLUDE_DIR)/package.mk 
    2222 
    23 define Package/irssi 
     23define Package/irssi/Default 
    2424  SUBMENU:=Instant Messaging 
    2525  SECTION:=net 
    2626  CATEGORY:=Network 
    27   DEPENDS:=+glib1 +libncurses 
     27  DEPENDS:=+glib2 +libncurses 
    2828  TITLE:=console irc client 
    2929  URL:=http://irssi.org/ 
    3030endef 
    3131 
    32 define Build/Configure 
     32define Package/irssi/Default/description 
     33        Irssi is a terminal based IRC client for UNIX systems. 
     34endef 
     35 
     36define Package/irssi 
     37$(call Package/irssi/Default) 
     38  TITLE+= (without OpenSSL support) 
     39endef 
     40 
     41define Package/irssi/description 
     42$(call Package/irssi/Default/description) 
     43 This package is built without OpenSSL support. 
     44endef 
     45 
     46define Package/irssi-openssl 
     47$(call Package/irssi/Default) 
     48  TITLE+= (with OpenSSL support) 
     49  DEPENDS+= +libopenssl 
     50endef 
     51 
     52define Package/irssi-openssl/description 
     53$(call Package/irssi/Default/description) 
     54 This package is built with OpenSSL support. 
     55endef 
     56 
     57define Build/Template 
     58 
     59$(STAMP_BUILT)-$(2): $(STAMP_PREPARED) 
     60        -$(MAKE) -C $(PKG_BUILD_DIR) clean 
    3361        $(call Build/Configure/Default, \ 
    3462                --with-perl=no \ 
    35                 --with-glib1 \ 
    3663                --with-glib-prefix="$(STAGING_DIR)/usr" \ 
    3764                --with-textui \ 
     
    3966                --without-bot \ 
    4067                --without-file-offset-size \ 
     68                --disable-ipv6 \ 
     69                --disable-proxy \ 
     70                $(3)) 
     71        $(MAKE) -C $(PKG_BUILD_DIR) 
     72        ( cd $(PKG_BUILD_DIR); mv -f src/fe-text/irssi $(PKG_NAME)-$(2) ) 
     73        touch $$@ 
     74 
     75$(STAMP_BUILT): $(STAMP_BUILT)-$(2) 
     76 
     77define Package/$(1)/install 
     78        $(INSTALL_DIR) $$(1)/usr/bin 
     79        $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME)-$(2)  $$(1)/usr/bin/$(PKG_NAME) 
     80endef 
     81endef 
     82 
     83EXTRA_CFLAGS+=-I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib/libiconv/include -I$(STAGING_DIR)/usr/lib/libintl/include 
     84EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib -L$(STAGING_DIR)/usr/lib/libintl/lib 
     85 
     86ifneq ($(SDK)$(CONFIG_PACKAGE_irssi),) 
     87  define Build/without-ssl 
     88    $(call Build/Template,irssi,without-ssl, \ 
    4189                --without-ssl \ 
    4290                --disable-ssl \ 
    43                 --enable-ipv6 \ 
    44                 --disable-proxy \ 
    45         ) 
    46 endef 
     91    ) 
     92  endef 
     93endif 
     94$(eval $(Build/without-ssl)) 
    4795 
    48 define Package/irssi/install     
    49         $(INSTALL_DIR) $(1)/usr/bin 
    50         $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/fe-text/irssi $(1)/usr/bin/ 
    51 endef 
     96ifneq ($(SDK)$(CONFIG_PACKAGE_irssi-openssl),) 
     97  define Build/with-openssl 
     98    $(call Build/Template,irssi-openssl,with-openssl, \ 
     99        --with-ssl="$(STAGING_DIR)/usr" \ 
     100    ) 
     101  endef 
     102endif 
     103$(eval $(Build/with-openssl)) 
    52104 
    53105$(eval $(call BuildPackage,irssi)) 
     106$(eval $(call BuildPackage,irssi-openssl)) 
     107 
  • packages/net/irssi/patches/100-cross_compiling_fix.patch

    r3390 r15105  
    1 diff -ruN irssi-0.8.10.orig/configure irssi-0.8.10/configure 
    2 --- irssi-0.8.10.orig/configure 2005-12-11 23:46:06.000000000 +0100 
    3 +++ irssi-0.8.10/configure      2006-02-24 13:19:21.570891250 +0100 
    4 @@ -21848,13 +21848,6 @@ 
    5   
    6  echo "$as_me:$LINENO: checking size of off_t" >&5 
    7  echo $ECHO_N "checking size of off_t... $ECHO_C" >&6 
    8 -if test "$cross_compiling" = yes; then 
    9 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 
    10 -See \`config.log' for more details." >&5 
    11 -echo "$as_me: error: cannot run test program while cross compiling 
    12 -See \`config.log' for more details." >&2;} 
    13 -   { (exit 1); exit 1; }; } 
    14 -else 
    15    cat >conftest.$ac_ext <<_ACEOF 
    16  /* confdefs.h.  */ 
    17  _ACEOF 
    18 @@ -21872,35 +21865,8 @@ 
    19    } 
    20   
    21  _ACEOF 
    22 -rm -f conftest$ac_exeext 
    23 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 
    24 -  (eval $ac_link) 2>&5 
    25 -  ac_status=$? 
    26 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    27 -  (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 
    28 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 
    29 -  (eval $ac_try) 2>&5 
    30 -  ac_status=$? 
    31 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    32 -  (exit $ac_status); }; }; then 
    33 - 
    34 -  sizeof_off_t=`cat conftestval` 
    35 -  rm -f conftestval 
    36 - 
    37 -else 
    38 -  echo "$as_me: program exited with status $ac_status" >&5 
    39 -echo "$as_me: failed program was:" >&5 
    40 -sed 's/^/| /' conftest.$ac_ext >&5 
    41 - 
    42 -( exit $ac_status ) 
    43 - 
    44 -  { { echo "$as_me:$LINENO: error: Unsupported off_t size" >&5 
    45 -echo "$as_me: error: Unsupported off_t size" >&2;} 
    46 -   { (exit 1); exit 1; }; } 
    47 - 
    48 -fi 
    49 +  sizeof_off_t=8 
    50  rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 
    51 -fi 
    52  echo "$as_me:$LINENO: result: $sizeof_off_t" >&5 
    53  echo "${ECHO_T}$sizeof_off_t" >&6 
    54   
Note: See TracChangeset for help on using the changeset viewer.