Ticket #6465: transmission_6465.diff

File transmission_6465.diff, 3.8 KB (added by swalker, 8 years ago)
  • feeds/packages/net/transmission/patches/001-debian_dont_build_libevent.patch

     
     1--- a/third-party/Makefile.am 
     2+++ b/third-party/Makefile.am 
     3@@ -4,7 +4,7 @@ else 
     4   DHT_DIR = 
     5 endif 
     6  
     7-SUBDIRS = libnatpmp miniupnp libevent $(DHT_DIR) 
     8+SUBDIRS = libnatpmp miniupnp $(DHT_DIR) 
     9  
     10 EXTRA_DIST = \ 
     11   macosx-libevent-config.h \ 
     12--- a/configure 
     13+++ b/configure 
     14@@ -1047,7 +1047,7 @@ LIBNOTIFY_CFLAGS 
     15 LIBNOTIFY_LIBS 
     16 DBUS_GLIB_CFLAGS 
     17 DBUS_GLIB_LIBS' 
     18-ac_subdirs_all='third-party/libevent' 
     19+#ac_subdirs_all='third-party/libevent' 
     20  
     21 # Initialize some variables set by options. 
     22 ac_init_help= 
     23@@ -19738,7 +19738,7 @@ fi 
     24  
     25  
     26  
     27-subdirs="$subdirs third-party/libevent" 
     28+#subdirs="$subdirs third-party/libevent" 
     29  
     30 libevent_source=bundled 
     31 { $as_echo "$as_me:$LINENO: checking for evutil_vsnprintf in -levent" >&5 
     32--- a/third-party/Makefile.in 
     33+++ b/third-party/Makefile.in 
     34@@ -70,7 +70,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE 
     35        distdir 
     36 ETAGS = etags 
     37 CTAGS = ctags 
     38-DIST_SUBDIRS = libnatpmp miniupnp libevent dht 
     39+DIST_SUBDIRS = libnatpmp miniupnp dht 
     40 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 
     41 am__relativize = \ 
     42   dir0=`pwd`; \ 
     43@@ -275,7 +275,7 @@ top_srcdir = @top_srcdir@ 
     44 transmissionlocaledir = @transmissionlocaledir@ 
     45 @DHT_FALSE@DHT_DIR =  
     46 @DHT_TRUE@DHT_DIR = dht 
     47-SUBDIRS = libnatpmp miniupnp libevent $(DHT_DIR) 
     48+SUBDIRS = libnatpmp miniupnp $(DHT_DIR) 
     49 EXTRA_DIST = \ 
     50   macosx-libevent-config.h \ 
     51   macosx-libevent-event-config.h 
  • feeds/packages/net/transmission/Makefile

     
    11# 
    2 # Copyright (C) 2009 OpenWrt.org 
     2# Copyright (C) 2009-2010 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
    55# See /LICENSE for more information. 
     
    88include $(TOPDIR)/rules.mk 
    99 
    1010PKG_NAME:=transmission 
    11 PKG_VERSION:=1.76 
     11PKG_VERSION:=1.77 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://mirrors.m0k.org/transmission/files 
    16 PKG_MD5SUM:=ac44511ba4c203998be3079626126ede 
     16PKG_MD5SUM:=d9457ac827faebb515062975d45835e9 
    1717 
    18 PKG_FIXUP = libtool 
     18PKG_FIXUP:=libtool 
     19PKG_INSTALL:=1 
    1920 
    2021include $(INCLUDE_DIR)/package.mk 
    2122 
     
    6465        --disable-wx \ 
    6566        --with-wx-config="$(STAGING_DIR)/usr/bin/" \ 
    6667 
    67 define Build/Compile 
    68         $(MAKE) -C $(PKG_BUILD_DIR) \ 
    69                 $(TARGET_CONFIGURE_OPTS) \ 
    70                 CFLAGS="$(TARGET_CFLAGS)" 
    71 endef 
     68MAKE_FLAGS += \ 
     69        CFLAGS="$(TARGET_CFLAGS)" \ 
    7270 
    7371define Package/transmission-daemon/install 
    74         $(INSTALL_DIR) $(1)/usr/sbin 
    75         $(INSTALL_BIN) $(PKG_BUILD_DIR)/daemon/transmission-daemon $(1)/usr/sbin/ 
     72        $(INSTALL_DIR) $(1)/usr/bin 
     73        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-daemon $(1)/usr/bin/ 
    7674endef 
    7775 
    7876define Package/transmission-cli/install 
    7977        $(INSTALL_DIR) $(1)/usr/bin 
    80         $(INSTALL_BIN) $(PKG_BUILD_DIR)/cli/transmissioncli $(1)/usr/bin/ 
    81         $(INSTALL_BIN) $(PKG_BUILD_DIR)/daemon/transmission-remote $(1)/usr/bin/ 
     78        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmissioncli $(1)/usr/bin/ 
     79        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-remote $(1)/usr/bin/ 
    8280endef 
    8381 
    8482define Package/transmission-web/install 
    8583        $(INSTALL_DIR) $(1)/usr/share/transmission 
    86         rm -rf `find $(PKG_BUILD_DIR)/web -type d -name .svn` 
    87         cp -rf $(PKG_BUILD_DIR)/web $(1)/usr/share/transmission 
     84        $(CP) $(PKG_INSTALL_DIR)/usr/share/transmission/web $(1)/usr/share/transmission/ 
    8885endef 
    8986 
    9087$(eval $(call BuildPackage,transmission-daemon))