diff -Nru boinctui-2.7.0/configure.in boinctui-2.7.0/configure.in --- boinctui-2.7.0/configure.in 2022-05-05 18:31:57.000000000 +0000 +++ boinctui-2.7.0/configure.in 2023-09-07 22:32:14.000000000 +0000 @@ -56,6 +56,13 @@ ] ) +AC_ARG_WITH( + [boinc-dir], + [AS_HELP_STRING([--with-boinc-dir=DIR], [Specify the BOINC data directory])], + [BOINC_DIR="$withval"], + [BOINC_DIR="/var/lib/boinc-client"] +) +AC_SUBST([BOINC_DIR]) # Checks for header files. diff -Nru boinctui-2.7.0/debian/changelog boinctui-2.7.0/debian/changelog --- boinctui-2.7.0/debian/changelog 2022-05-05 18:31:57.000000000 +0000 +++ boinctui-2.7.0/debian/changelog 2023-09-07 22:32:14.000000000 +0000 @@ -1,8 +1,8 @@ -boinctui (2.7.0-0~202205051521~ubuntu20.04.1) focal; urgency=low +boinctui (2.7.0-0~202309071813~ubuntu20.04.1) focal; urgency=low * Auto build. - -- Gianfranco Costamagna Thu, 05 May 2022 18:31:57 +0000 + -- Gianfranco Costamagna Thu, 07 Sep 2023 22:32:14 +0000 boinctui (2.7.0-1) unstable; urgency=low diff -Nru boinctui-2.7.0/debian/git-build-recipe.manifest boinctui-2.7.0/debian/git-build-recipe.manifest --- boinctui-2.7.0/debian/git-build-recipe.manifest 2022-05-05 18:31:57.000000000 +0000 +++ boinctui-2.7.0/debian/git-build-recipe.manifest 2023-09-07 22:32:14.000000000 +0000 @@ -1,2 +1,2 @@ -# git-build-recipe format 0.4 deb-version {debupstream}-0~202205051521 -lp:boinctui git-commit:35d0ddc601df12b09632c5cd7bf31c8b8db6649f +# git-build-recipe format 0.4 deb-version {debupstream}-0~202309071813 +lp:boinctui git-commit:5a37635de47c220ba2d3808c0a02be403182222b diff -Nru boinctui-2.7.0/Makefile.in boinctui-2.7.0/Makefile.in --- boinctui-2.7.0/Makefile.in 2022-05-05 18:31:57.000000000 +0000 +++ boinctui-2.7.0/Makefile.in 2023-09-07 22:32:14.000000000 +0000 @@ -24,7 +24,7 @@ BINDIR = @bindir@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ DOCDIR = $(DATAROOTDIR)@docdir@ - +AM_CPPFLAGS = -DBOINC_DIR=\"@BOINC_DIR@\" BINDIR = @bindir@ ifeq (@HAVE_OPENSSL@, 1) @@ -39,7 +39,7 @@ $(ODIR)/%.o: $(SDIR)/%.cpp @echo " " - $(CPP) -c $(CXXFLAGS) $(CPPFLAGS) $(DEFS) -o $(ODIR)/$*.o $< + $(CPP) -c $(CXXFLAGS) $(CPPFLAGS) $(AM_CPPFLAGS) $(DEFS) -o $(ODIR)/$*.o $< clean: rm -f $(ODIR)/*.o $(PACKAGE_TARNAME) config.log diff -Nru boinctui-2.7.0/src/resultparse.cpp boinctui-2.7.0/src/resultparse.cpp --- boinctui-2.7.0/src/resultparse.cpp 2022-05-05 18:31:57.000000000 +0000 +++ boinctui-2.7.0/src/resultparse.cpp 2023-09-07 22:32:14.000000000 +0000 @@ -123,7 +123,7 @@ //kLogPrintf("\ncallbackData()-->[%s]<-- len=%d\n",tmp,len); //заносим значение в текущий эл-т bool empty = true; - for (uint i = 0; i < strlen(tmp); i++) + for (unsigned int i = 0; i < strlen(tmp); i++) { if (tmp[i] != ' ') { diff -Nru boinctui-2.7.0/src/srvdata.cpp boinctui-2.7.0/src/srvdata.cpp --- boinctui-2.7.0/src/srvdata.cpp 2022-05-05 18:31:57.000000000 +0000 +++ boinctui-2.7.0/src/srvdata.cpp 2023-09-07 22:32:14.000000000 +0000 @@ -146,7 +146,9 @@ { if((gCfg->cmdlinepwd=="")&&(gCfg->cmdlocalhost)) { - std::ifstream ifs("/var/lib/boinc-client/gui_rpc_auth.cfg"); + std::string boincDataDirPath = BOINC_DIR; + std::string guiRpcAuthCfgPath = boincDataDirPath + "/gui_rpc_auth.cfg"; + std::ifstream ifs(guiRpcAuthCfgPath.c_str()); std::string s((std::istreambuf_iterator(ifs)), (std::istreambuf_iterator())); for(auto c : s) diff -Nru boinctui-2.7.0/src/topmenu.cpp boinctui-2.7.0/src/topmenu.cpp --- boinctui-2.7.0/src/topmenu.cpp 2022-05-05 18:31:57.000000000 +0000 +++ boinctui-2.7.0/src/topmenu.cpp 2023-09-07 22:32:14.000000000 +0000 @@ -502,7 +502,7 @@ if (client_state != NULL) { std::vector projects = client_state->getItems("project"); - for (uint i = 0; i < projects.size(); i++) + for (unsigned int i = 0; i < projects.size(); i++) { Item* project_name = projects[i]->findItem("project_name"); if (project_name != NULL) @@ -817,7 +817,7 @@ if (projects != NULL) { std::vector projlist = projects->getItems("project"); - for (uint i = 0; i < projlist.size(); i++) + for (unsigned int i = 0; i < projlist.size(); i++) { Item* name = projlist[i]->findItem("name"); Item* general_area = projlist[i]->findItem("general_area"); @@ -899,7 +899,7 @@ if (projects != NULL) { std::vector mgrlist = projects->getItems("account_manager"); - for (uint i = 0; i < mgrlist.size(); i++) + for (unsigned int i = 0; i < mgrlist.size(); i++) { Item* name = mgrlist[i]->findItem("name"); if (name != NULL)